Changeset 646

Timestamp:

Dec 14, 2013, 12:51:59 PM (11 years ago)

Author:

maron

Message:

• Added: Options export from all users

Location:

trunk

Files:

• Modules/Export/Export.php (modified) (1 diff)
• Modules/Export/Page.php (modified) (4 diffs)
• admin/UpdateTrace.php (modified) (2 diffs)
• includes/Version.php (modified) (1 diff)
• locale/cs.php (modified) (1 diff)

trunk/Modules/Export/Export.php

@@ -22 +22 @@
     $this->SourceDirRelative = $this->Config['Web']['SourceFolder'];
     if(!file_exists($this->SourceDir)) mkdir($this->SourceDir, 0777, true);
+    $this->SaveAllUsers();
+  }
+  
+  function SaveAllUsers() {
+                $DbResult = $this->System->Database->query('SELECT * FROM `Export` WHERE `Id`='.$this->Id);
+                $Export = $DbResult->fetch_assoc();
+                if ($Export['AllUsers']) {
+                        $DbResult2 = $this->System->Database->query('SELECT ID FROM `User` WHERE `ID` NOT IN(SELECT `User` FROM `ExportUser` WHERE `Export`='.$this->Id.')');
+                        while($UserLine = $DbResult2->fetch_assoc())
+                        {
+                                                $Condition = ' WHERE `Export`='.$this->Id.' AND `User`='.$UserLine['ID'];
+                                                $DbResult = $this->System->Database->query('SELECT * FROM `ExportUser` '.$Condition); //,MAX(`Sequence`) as MaxSequence
+                                                if($DbResult->num_rows > 0)
+                                                {
+                                                //      $this->System->Database->query('UPDATE `ExportUser` SET `Sequence`='.$Value.$Condition);
+                                                } else
+                                                {
+              $this->System->Database->query('INSERT INTO `ExportUser` (`Export`, `User`, `Sequence`) VALUES ('.$this->Id.', '.$UserLine['ID'].', 0)');
+                                                }
+                        }
+                        
+      $this->System->Database->query('SET @I = 0');
+                        $this->System->Database->query('UPDATE `ExportUser` SET `Sequence` = (@I := @I + 1) WHERE `Export`='.$this->Id.' ORDER BY `Sequence`;');
+                }
   }
   

trunk/Modules/Export/Page.php

@@ -138 +138 @@
                 return($Output);
         }
+        
+        function SaveAllUsers()
+        {
+         global $System;
+            $Export = new Export($System);
+      $Export->Id = $_GET['ExportId'];
+      $Export->SaveAllUsers();
+      
+  }
         
         function ExportViewTranslators()
@@ -176 +185 @@
                                 }
         
+                          if (array_key_exists('AllUsers', $_POST)) { 
+            //add allusers to export
+                                                $this->System->Database->query('UPDATE `Export` SET `AllUsers`=1 WHERE `Id`='.$_GET['ExportId']);
+            
+                  //update export stat
+            $Export['AllUsers'] = 1;
+            $this->SaveAllUsers();
+          } else {
+                  //update export stat
+            $Export['AllUsers'] = 0;
+                                                $this->System->Database->query('UPDATE `Export` SET `AllUsers`=0 WHERE `Id`='.$_GET['ExportId']);
+          }
+
                                 // Recalculate sequence number
                                 $this->System->Database->query('SET @I = 0');
@@ -208 +230 @@
                 {
                         $Output .= '<input type="submit" value="Uložit" '.$DisabledInput[$Editable].'/>'.
-                                        '<input type="hidden" name="Operation" value="Save"/>'.
-                                        ' <span onclick="CheckAllCheckbox();">'.CheckBox('CheckAll', False, 'CheckAll').' Zatrhnout vše</span> '.
+                                        '<input type="hidden" name="Operation" value="Save"/><br />'.
+                                        ' <span onclick="CheckAllCheckbox();">'.CheckBox('CheckAll', False, 'CheckAll').' Zatrhnout vše na stránce</span> <br />'.
+                                        ' <span>'.CheckBox('AllUsers', $Export['AllUsers']).' '.T('Export allways from all users').'</span> '.
                                         '<br />'.
                                         'Zvolte ze seznamu uživatele, od kterých chcete načítat překlady a upravte jejich pořadí.<br />'.
@@ -226 +249 @@
                         $XP = GetLevelMinMax($UserLine['XP']);
                         $Checked = $UserLine['Sequence'] != '';
-                        $Selection = CheckBox('sel'.$UserLine['ID'], $Checked, '', 'CheckBox', !$Editable);
+                        $Selection = CheckBox('sel'.$UserLine['ID'], $Checked, '', 'CheckBox', ((!$Editable) or ($Export['AllUsers'])));
                         $Sequence = '<input type="text" name="seq'.$UserLine['ID'].'" style="text-align: center; width: 40px;" value="'.$UserLine['Sequence2'].'"'.$DisabledInput[$Editable].'/>';
                         $Output .= '<tr>'.

trunk/admin/UpdateTrace.php

@@ -2665 +2665 @@
 }
 
+function UpdateTo646($Manager)
+{
+        $Manager->Execute('ALTER TABLE  `Export` ADD  `AllUsers` TINYINT( 1 ) NOT NULL ;');
+
+}
+
 $Updates = array(
         498 => array('Revision' => 506, 'Function' => 'UpdateTo506'),
@@ -2680 +2686 @@
         609 => array('Revision' => 610, 'Function' => 'UpdateTo610'),
         610 => array('Revision' => 639, 'Function' => 'UpdateTo639'),
+        639 => array('Revision' => 646 , 'Function' => 'UpdateTo646'),
 );

trunk/includes/Version.php

@@ -6 +6 @@
 // and system will need database update. 
 
-$Revision = 645; // Subversion revision
-$DatabaseRevision = 639; // Database structure revision 
-$ReleaseTime = '2013-12-13';
+$Revision = 646; // Subversion revision
+$DatabaseRevision = 646; // Database structure revision 
+$ReleaseTime = '2013-12-14';

trunk/locale/cs.php

@@ -135 +135 @@
       'Item not specified' => 'Položka nezadána',
       'Settings saved' => 'Nastavení uloženo',
+      'Export allways from all users' => 'Exportovat vždy od všech uživatelů',
       'There are servers listed which are in fact offering translated game. '.
     'There is resoluted if translation is offered either on client side, on server side or both. '.