Changeset 376 for trunk/export/export.php

Timestamp:

Mar 11, 2010, 8:40:32 AM (15 years ago)

Author:

george

Message:

• Upraveno: Informace o přihlášeném uživateli nově pročištěny a sjednoceny do třídy User. SQL pro kontrolu a generovány hesel dostupné přímo přes metodu CryptPasswordSQL. Přístup k Id přihlášeného uživatele přes globální proměnnou $User a vlastnost Id ($User->Id). Podobně přístup k dalším vlastnostem uživatele.
• Opraveno: Některé chyby z předchozích předělávek.

File:

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

trunk/export/export.php

@@ -11 +11 @@
   var $SelectedUsers;
   var $UserNames;
-  var $User;
   var $ClientVersion;
   var $OrderByUserList;
@@ -38 +37 @@
     $this->UserNames = '';
     $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['ID'];
-      $this->UserNames .= ','.$User['Name'];
+    while($UserLine = $DbResult->fetch_assoc())
+    {
+      $this->SelectedUsers .= ','.$UserLine['ID'];
+      $this->UserNames .= ','.$UserLine['Name'];
     }
     $this->SelectedUsers = substr($this->SelectedUsers, 1);
@@ -56 +55 @@
     }
     
-    // Load logged user
-    if(isset($_SESSION) and ($_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ý');
-
-
     $DbResult = $this->Database->query('SELECT * FROM `ClientVersion` WHERE `Id`='.$this->Export['ClientVersion']);
     $this->ClientVersion = $DbResult->fetch_assoc();    
@@ -70 +61 @@
   function ExportToMangosSQL()
   {
-    global $TranslationTree, $LanguageList;
+    global $TranslationTree, $LanguageList, $User, $Config;
   
     $this->LoadFilters();
@@ -82 +73 @@
       "-- Znaková sada: ".$this->Config['Database']['Charset']." / ".$this->Config['Web']['Charset']."\n".
       "-- Diakritika: ".$this->AnoNe[$this->Export['WithDiacritic']]."\n".
-      "-- Vygeneroval uživatel: ".$this->User['Name']."\n".
+      "-- Vygeneroval uživatel: ".$User->Name."\n".
       "-- Vzato od uživatelů: ".$this->UserNames."\n".
       "-- Generované tabulky: ";
@@ -89 +80 @@
     while($Group = $DbResult->fetch_assoc())
     {
-       $Buffer .= $Group['MangosTable'].', ';
+      $Buffer .= $Group['TablePrefix'].', ';
     }
     $Buffer .= "\n\n";  
@@ -146 +137 @@
       {
         $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');
+        $DbResult2 = $Database2->query('SELECT `Text` AS `En`,
+        (SELECT `Text` FROM `'.$Config['Database']['Database'].'`.`TextGlobalString` 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'].'`.`TextGlobalString` AS `TableEn` WHERE
+          `Text` = "'.addslashes($Ori_text).'" LIMIT 1');
         $Tran = $DbResult2->fetch_assoc();
         //echo ($Line['name'].'='.$Tran['tran']);
-        if($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
+          $DbResult2 = $Database2->query('SELECT `OptionText` AS `En`,
+          (SELECT `OptionText` FROM `'.$this->Config['Database']['Database'].'`.`TextNPCOption` 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'].'`.`TextNPCOption` 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";
+        if($Tran['Tran'] <> '')
+          $Buffer .= 'UPDATE `'.$AoWoWTable.'` SET `name` = "'.addslashes($Tran['Tran']).'" WHERE '.$IndexColum.' = '.$Line[$IndexColum].' ;'."\n";
       }
       $Buffer .= "\n\n";  
@@ -176 +167 @@
   function ExportToXML()
   {
-    global $TranslationTree, $LanguageList;
+    global $TranslationTree, $LanguageList, $User;
   
     $this->LoadFilters($this->Id);
@@ -186 +177 @@
     "    <time>".date('r')."</time>\n".
     "    <diacritics mode=".'"'.$this->Export['WithDiacritic'].'"'." />\n".
-    "    <author>".$this->User['Name']."</author>\n".
+    "    <author>".$User->Name."</author>\n".
     "    <contributors>\n";
     foreach(explode(',', $this->UserNames) as $UserName)
@@ -209 +200 @@
       while($Line = $DbResult2->fetch_assoc()) 
       {
-        $Buffer .= '      <item id="'.$Line['entry'].'" user="'.$Line['UserName'].'">'."\n";
+        $Buffer .= '      <item id="'.$Line['Entry'].'" user="'.$Line['UserName'].'">'."\n";
         $Values = '';
         foreach($TranslationTree[$Group['Id']]['Items'] as $GroupItem)
@@ -242 +233 @@
          $columns = '';
          foreach($TranslationTree[$Group['Id']]['Items'] as $Column) {
-           $columns .= ' T.'.$Column['Column'].' as text'.$i.',';
+           $columns .= ' `T`.`'.$Column['Column'].'` AS `Text`'.$i.',';
            $i = $i+1;
          }
          
-         $querty = '"SELECT '.$columns.' T.Entry as entry FROM (SELECT * FROM '.$Group['TablePrefix'].' WHERE (Complete = 1) AND '.$this->WhereLang.' AND '.$this->WhereUsers.' AND VersionStart <= '.$this->ClientVersion['BuildNumber'].' AND VersionEnd >= '.$this->ClientVersion['BuildNumber'].') AS T GROUP BY T.Entry"';
+         $querty = '"SELECT '.$columns.' `T`.`Entry` AS `Entry` FROM (SELECT * FROM '.$Group['TablePrefix'].' WHERE (`Complete` = 1) AND '.$this->WhereLang.' AND '.$this->WhereUsers.' AND (`VersionStart` <= '.$this->ClientVersion['BuildNumber'].') AND (`VersionEnd` >= '.$this->ClientVersion['BuildNumber'].')) AS `T` GROUP BY `T`.`Entry`"';
       
        $params = '-u '.$Config['Database']['User'].' -p '.$Config['Database']['Password'].' -f ../source/'.$this->ClientVersion['Version'].'/dbc/'.$Group['DBCFileName'].'.dbc -n '.$this->TempDir.'dbc/'.$Group['DBCFileName'].'.dbc -c '.GetDBCColumns($this->ClientVersion['Version'], $Group['DBCFileName']).' -q '.$querty;