Changeset 365 for trunk/export/export.php

Timestamp:

Mar 9, 2010, 11:29:05 AM (14 years ago)

Author:

george

Message:

• Upraveno: Jména tabulek v databází upraveny na stejná s prvními velkými písmeny.
• Upraveno: Doplněny SQL uvozovky do mnoha SQL dotazů.

File:

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

trunk/export/export.php

@@ -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`.`Name`, `User`.`ID` FROM `ExportUser` LEFT JOIN `User` ON `User`.`ID`=`ExportUser`.`User` WHERE `ExportUser`.`Export`='.$this->Id.' ORDER BY `ExportUser`.`Sequence`');
     while($User = $DbResult->fetch_assoc())
     {
-      $this->SelectedUsers .= ','.$User['User'];
-      $this->UserNames .= ','.$User['user'];
+      $this->SelectedUsers .= ','.$User['ID'];
+      $this->UserNames .= ','.$User['Name'];
     }
     $this->SelectedUsers = substr($this->SelectedUsers, 1);
@@ -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 `Name` FROM `User` WHERE `ID`='.$_SESSION['UserID']);
       $this->User = $DbResult->fetch_assoc();
-    } else $this->User = array('user' => 'Neznámý');
+    } else $this->User = array('User' => 'Neznámý');
 
 
@@ -82 +82 @@
       "-- Znaková sada: ".$this->Config['Database']['Charset']." / ".$this->Config['Web']['Charset']."\n".
       "-- Diakritika: ".$this->AnoNe[$this->Export['WithDiacritic']]."\n".
-      "-- Vygeneroval uživatel: ".$this->User['user']."\n".
+      "-- Vygeneroval uživatel: ".$this->User['Name']."\n".
       "-- Vzato od uživatelů: ".$this->UserNames."\n".
       "-- Generované tabulky: ";
@@ -98 +98 @@
       if($Group['MangosTable'] != '')
       {
-        $Query = 'SELECT * 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 * 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 .= "\n\n-- ".$Group['Name']."\n\n";
@@ -111 +111 @@
           }
           $Values = substr($Values, 2);
-          $Buffer .= 'UPDATE `'.$Group['MangosTable'].'` SET '.$Values.' WHERE `'.$Group['MangosTableIndex'].'` = '.$Line['entry'].';'."\n"; 
+          $Buffer .= 'UPDATE `'.$Group['MangosTable'].'` SET '.$Values.' WHERE `'.$Group['MangosTableIndex'].'` = '.$Line['Entry'].';'."\n"; 
         }     
       }
@@ -146 +146 @@
       {
         $Ori_text = $Line['name'];
-        $DbResult2 = $Database2->query('SELECT text as en,
+        $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`
@@ -186 +186 @@
     "    <time>".date('r')."</time>\n".
     "    <diacritics mode=".'"'.$this->Export['WithDiacritic'].'"'." />\n".
-    "    <author>".$this->User['user']."</author>\n".
+    "    <author>".$this->User['Name']."</author>\n".
     "    <contributors>\n";
     foreach(explode(',', $this->UserNames) as $UserName)
@@ -203 +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 `Name` 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";
@@ -251 +251 @@
       {
         $Line = $DBCFile->GetLine($I);
-        $Query = 'SELECT * FROM (SELECT * FROM '.$Group['TablePrefix'].' WHERE (Complete = 1) AND '.$this->WhereLang.' AND '.$this->WhereUsers.' AND (entry='.$Line[0].')  AND VersionStart <= '.$this->ClientVersion['BuildNumber'].' AND VersionEnd >= '.$this->ClientVersion['BuildNumber'].' ORDER BY FIELD(User, '.$this->SelectedUsers.')) AS T GROUP BY T.entry';       
+        $Query = 'SELECT * FROM (SELECT * FROM '.$Group['TablePrefix'].' WHERE (`Complete` = 1) AND '.$this->WhereLang.' AND '.$this->WhereUsers.' AND (`Entry`='.$Line[0].')  AND `VersionStart` <= '.$this->ClientVersion['BuildNumber'].' AND `VersionEnd` >= '.$this->ClientVersion['BuildNumber'].' ORDER BY FIELD(`User`, '.$this->SelectedUsers.')) AS `T` GROUP BY `T`.`Entry`';       
         $DbResult2 = $this->Database->query($Query);
         if($DbResult2->num_rows > 0)
@@ -299 +299 @@
           $Value['Comment'] = substr(trim($LineParts[1]), 3);
 
-          $Query = 'SELECT * FROM (SELECT * FROM `'.$Group['TablePrefix'].'` WHERE (`Complete` = 1) AND '.$this->WhereLang.' AND '.$this->WhereUsers.' AND (`ShortCut`="'.$Value['ShortCut'].'") AND (`VersionStart` <= '.$this->ClientVersion['BuildNumber'].') AND (`VersionEnd` >= '.$this->ClientVersion['BuildNumber'].')'.$this->OrderByUserList.') AS `T` GROUP BY `T`.`entry`';
+          $Query = 'SELECT * FROM (SELECT * FROM `'.$Group['TablePrefix'].'` WHERE (`Complete` = 1) AND '.$this->WhereLang.' AND '.$this->WhereUsers.' AND (`ShortCut`="'.$Value['ShortCut'].'") AND (`VersionStart` <= '.$this->ClientVersion['BuildNumber'].') AND (`VersionEnd` >= '.$this->ClientVersion['BuildNumber'].')'.$this->OrderByUserList.') AS `T` GROUP BY `T`.`Entry`';
           //echo($Query);
           $DbResult2 = $this->Database->query($Query);