Changeset 179 for trunk/export/export.php

Timestamp:

Apr 12, 2009, 12:01:02 PM (16 years ago)

Author:

maron

Message:

Indexování dat při exportu podle ID, vlastní logo, anglické texty v locales místo ruských

File:

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

trunk/export/export.php

@@ -98 +98 @@
   if($Setting['language-sk']) $WhereLang .= " OR (Language = 2)";
   if($Setting['language-other']) $WhereLang .= " OR (Language = 3)";
-  if($WhereLang == '') $WhereLang = 1; 
-    else $WhereLang = '('.substr($WhereLang, 4).')';
-
-  $SelectedUsers = '';  
-  foreach($Setting['users-selection'] as $Item)
-    $SelectedUsers .= ','.$Item;
-  $SelectedUsers = substr($SelectedUsers, 1);
-
-  if($SelectedUsers == '') $Where = 0;
-    else $Where = 'ID IN ('.$SelectedUsers.')';
-  
-  $UserNames = '';
-  $DbResult = $Database->SQLCommand('SELECT user FROM `user` WHERE '.$Where);
-  while($DbRow = mysql_fetch_assoc($DbResult))
-    $UserNames .= ','.$DbRow['user'];
-  $UserNames = substr($UserNames, 1);    
-   
-  if($SelectedUsers == '') $WhereUsers = 1; 
-    else $WhereUsers = '(User IN ('.$SelectedUsers.'))';
-
+  if($WhereLang == '') $WhereLang = 1;
+    else $WhereLang = '('.substr($WhereLang, 4).')';
+
+  $SelectedUsers = '';  
+  foreach($Setting['users-selection'] as $Item)
+    $SelectedUsers .= ','.$Item;
+  $SelectedUsers = substr($SelectedUsers, 1);
+
+  if($SelectedUsers == '') $Where = 0;
+    else $Where = 'ID IN ('.$SelectedUsers.')';
+  
+  $UserNames = '';
+  $DbResult = $Database->SQLCommand('SELECT user FROM `user` WHERE '.$Where);
+  while($DbRow = mysql_fetch_assoc($DbResult))
+    $UserNames .= ','.$DbRow['user'];
+  $UserNames = substr($UserNames, 1);    
+   
+  if($SelectedUsers == '') $WhereUsers = 1; 
+    else $WhereUsers = '(User IN ('.$SelectedUsers.'))';
 
         //data to aowow
@@ -123 +122 @@
         $Database->SelectDatabase($AoWoWconf['mangos']['db']);    
         $Database->SQLCommand('SET NAMES '.$Config['Database']['Charset']);
-    $AoWoWTables = array('aowow_resistances', 'aowow_spelldispeltype', 'aowow_skill');
-        foreach($AoWoWTables as $AoWoWTable) {
-        $Buffer .= $AoWoWTable.', ';
+    $AoWoWTables = array('aowow_resistances' => 'Id', 'aowow_spelldispeltype' => 'Id', 'aowow_skill' => 'skillID');
+        foreach($AoWoWTables as $AoWoWTable => $IndexColum) {
+        $Buffer .= '--'.$AoWoWTable.', ';
                 $Buffer .= "\n\n";  
-            $Query = 'SELECT name FROM '.$AoWoWTable;
+            $Query = 'SELECT name,'.$IndexColum.' FROM '.$AoWoWTable;
         $ID = $Database->SQLCommand($Query);
                 while($Line = mysql_fetch_assoc($ID)) {
@@ -138 +137 @@
                         //echo ($Line['name'].'='.$Tran['tran']);
                         if ($Tran['tran'] <> '')
-                                $Buffer .= 'UPDATE `'.$AoWoWTable.'` SET name = "'.addslashes($Tran['tran']).'" WHERE name = "'.addslashes($Line['name']).'";'."\n";
+                                $Buffer .= 'UPDATE `'.$AoWoWTable.'` SET name = "'.addslashes($Tran['tran']).'" WHERE '.$IndexColum.' = '.$Line[$IndexColum].' ;'."\n";
                 }
                 $Buffer .= "\n\n";  
         }
+        if($Setting['Diacritics'] != 1) $Buffer = utf2ascii($Buffer);
         return($Buffer);
 }