Changeset 349 for trunk/export/export.php

Timestamp:

Mar 3, 2010, 10:37:40 AM (14 years ago)

Author:

george

Message:

• Opraveno: Neprovádět prázdné SQL řádky při vykonávání exportu pro AoWoW.
• Opraveno: Chyba použití globální proměné při generování obrázků XP překladatelů při zobzarení týmu. Nestandardně zde byl vkládán skript přes include uvnitř funkce, což zapříčinilo změnu globálních proměnných na lokální.
• Upraveno: Doplněny SQL uvozovky v některých dotazech.

File:

• trunk/export/export.php (modified) (7 diffs)

trunk/export/export.php

@@ -23 +23 @@
   function LoadFilters()
   {  
-    $DbResult = $this->Database->query('SELECT * FROM `Export` WHERE Id='.$this->Id);
+    $DbResult = $this->Database->query('SELECT * FROM `Export` WHERE `Id`='.$this->Id);
     $this->Export = $DbResult->fetch_assoc();
 
     // Filter selected languages
     $this->WhereLang = '';
-    $DbResult = $this->Database->query('SELECT * FROM `ExportLanguage` WHERE Export='.$this->Id.' ORDER BY Sequence');
+    $DbResult = $this->Database->query('SELECT * FROM `ExportLanguage` WHERE `Export`='.$this->Id.' ORDER BY `Sequence`');
     while($Language = $DbResult->fetch_assoc())
-      $this->WhereLang .= ' OR (Language = '.$Language['Language'].')'; 
+      $this->WhereLang .= ' OR (`Language` = '.$Language['Language'].')'; 
     if($this->WhereLang == '') $this->WhereLang = 1; 
       else $this->WhereLang = '('.substr($this->WhereLang, 4).')';
@@ -37 +37 @@
     $this->SelectedUsers = '';  
     $this->UserNames = '';
-    $DbResult = $this->Database->query('SELECT ExportUser.*, user.user FROM `ExportUser` LEFT JOIN user ON user.ID=ExportUser.User WHERE ExportUser.Export='.$this->Id.' ORDER BY ExportUser.Sequence');
+    $DbResult = $this->Database->query('SELECT `ExportUser`.*, `user`.`user` FROM `ExportUser` LEFT JOIN `user` ON `user`.`ID`=`ExportUser`.`User` WHERE `ExportUser`.`Export`='.$this->Id.' ORDER BY `ExportUser`.`Sequence`');
     while($User = $DbResult->fetch_assoc())
     {
@@ -52 +52 @@
     } else
     {
-      $this->WhereUsers = '(User IN ('.$this->SelectedUsers.'))';
-      $this->OrderByUserList = ' ORDER BY FIELD(User, '.$this->SelectedUsers.')';
+      $this->WhereUsers = '(`User` IN ('.$this->SelectedUsers.'))';
+      $this->OrderByUserList = ' ORDER BY FIELD(`User`, '.$this->SelectedUsers.')';
     }
     
@@ -59 +59 @@
     if(isset($_SESSION) and ($_SESSION['UserID'] != ''))
     {
-      $DbResult = $this->Database->query('SELECT user FROM `user` WHERE ID='.$_SESSION['UserID']);
+      $DbResult = $this->Database->query('SELECT `user` FROM `user` WHERE `ID`='.$_SESSION['UserID']);
       $this->User = $DbResult->fetch_assoc();
     } else $this->User = array('user' => 'Neznámý');
@@ -141 +141 @@
       $Buffer .= '--'.$AoWoWTable.', ';
       $Buffer .= "\n\n";  
-      $Query = 'SELECT name,'.$IndexColum.' FROM '.$AoWoWTable;
+      $Query = 'SELECT `name`,`'.$IndexColum.'` FROM `'.$AoWoWTable.'`';
       $DbResult = $Database2->query($Query);
       while($Line = $DbResult->fetch_assoc()) 
@@ -147 +147 @@
         $Ori_text = $Line['name'];
         $DbResult2 = $Database2->query('SELECT text as en,
-        (SELECT text FROM '.$Config['Database']['Database'].'.global_strings as tabletran
-         WHERE tableen.entry = tabletran.entry AND (Complete = 1) AND '.$this->WhereLang.'
-          AND '.$this->WhereUsers.$this->OrderByUserList.' LIMIT 1) as tran
-         FROM '.$Config['Database']['Database'].'.global_strings as tableen WHERE
-          text = "'.addslashes($Ori_text).'" LIMIT 1');
+        (SELECT `text` FROM `'.$Config['Database']['Database'].'`.`global_strings` AS `tabletran`
+         WHERE `tableen`.`entry` = `tabletran`.`entry` AND (`Complete` = 1) AND '.$this->WhereLang.' AND '.$this->WhereUsers.$this->OrderByUserList.' LIMIT 1) AS `tran`
+         FROM `'.$Config['Database']['Database'].'`.`global_strings` AS `tableen` WHERE
+          `text` = "'.addslashes($Ori_text).'" LIMIT 1');
         $Tran = $DbResult2->fetch_assoc();
         //echo ($Line['name'].'='.$Tran['tran']);
         if($Tran['tran'] == '') 
         {
-          $DbResult2 = $Database2->query('SELECT OptionText as en,
-          (SELECT OptionText FROM '.$this->Config['Database']['Database'].'.npc_option as tabletran
-           WHERE tableen.entry = tabletran.entry AND (Complete = 1) AND '.$this->WhereLang.'
-            AND '.$this->WhereUsers.$this->OrderByUserList.' LIMIT 1) as tran
-          FROM '.$this->Config['Database']['Database'].'.npc_option as tableen WHERE
-            OptionText = "'.addslashes($Ori_text).'" LIMIT 1');
+          $DbResult2 = $Database2->query('SELECT `OptionText` AS `en`,
+          (SELECT `OptionText` FROM `'.$this->Config['Database']['Database'].'`.`npc_option` AS `tabletran`
+           WHERE `tableen`.`entry` = `tabletran`.`entry` AND (`Complete` = 1) AND '.$this->WhereLang.'
+            AND '.$this->WhereUsers.$this->OrderByUserList.' LIMIT 1) AS `tran`
+          FROM `'.$this->Config['Database']['Database'].'`.`npc_option` AS `tableen` WHERE
+            `OptionText` = "'.addslashes($Ori_text).'" LIMIT 1');
           $Tran = $DbResult2->fetch_assoc();
         }
         
         if($Tran['tran'] <> '')
-          $Buffer .= 'UPDATE `'.$AoWoWTable.'` SET name = "'.addslashes($Tran['tran']).'" WHERE '.$IndexColum.' = '.$Line[$IndexColum].' ;'."\n";
+          $Buffer .= 'UPDATE `'.$AoWoWTable.'` SET `name` = "'.addslashes($Tran['tran']).'" WHERE '.$IndexColum.' = '.$Line[$IndexColum].' ;'."\n";
       }
       $Buffer .= "\n\n";  
@@ -204 +203 @@
         $Group['MangosTableIndex'] = 'entry';
       }
-      $Query = 'SELECT *,(SELECT user FROM user WHERE user.ID=T.User) as UserName FROM (SELECT * FROM '.$Group['TablePrefix'].' WHERE (Complete = 1) AND (VersionStart <= '.$this->ClientVersion['BuildNumber'].') AND (VersionEnd >= '.$this->ClientVersion['BuildNumber'].') AND '.$this->WhereLang.' AND '.$this->WhereUsers.$this->OrderByUserList.') AS T GROUP BY T.entry'; 
+      $Query = 'SELECT *,(SELECT `user` FROM `user` WHERE `user`.`ID`=`T`.`User`) AS `UserName` FROM (SELECT * FROM `'.$Group['TablePrefix'].'` WHERE (`Complete` = 1) AND (`VersionStart` <= '.$this->ClientVersion['BuildNumber'].') AND (`VersionEnd` >= '.$this->ClientVersion['BuildNumber'].') AND '.$this->WhereLang.' AND '.$this->WhereUsers.$this->OrderByUserList.') AS `T` GROUP BY `T`.`entry`'; 
       //echo($Query);
       $Buffer .= '    <group id="'.$Group['Id'].'" name="'.$Group['TablePrefix'].'">'."\n";