Changeset 455 for trunk/export

Timestamp:

Apr 13, 2010, 10:03:12 AM (15 years ago)

Author:

george

Message:

• Upraveno: Přístup k databázi převeden na objektový pomocí rozšířené PHP třídy mysqli. Při práci s databází použít globální objekt $System a jeho prvek $Database ($System->Database->query("SELECT ...");.
• Upraveno: Při vkládání nové zprávy do Kecátka neprovádět přesměrování, ale rovnou zobrazit výpis. U některých překladatelů toto způsobovalo opakované vložení zprávy.

Location:

trunk/export

Files:

• create_addon.php (modified) (3 diffs)
• export_output.php (modified) (3 diffs)
• index.php (modified) (36 diffs)
• process_aowow_export.php (modified) (2 diffs)
• process_task.php (modified) (3 diffs)

trunk/export/create_addon.php

@@ -107 +107 @@
     while($Group = $DbResult->fetch_assoc())
     {
-          //získání čísla verze pro export
+    //získání čísla verze pro export
       $ID = $this->Database->query('SELECT LastVersion FROM `Group` WHERE Id = '.$Group['Id']); 
       $LastVersion = $ID->fetch_assoc();
@@ -163 +163 @@
       {
         $Buffer .= 'CZWOW_'.$Column['AddonFileName'].'_count=0;'."\n"; 
-          }
-          
+    }
+    
     file_put_contents($this->TempDir.'CzWoW/'.$CountFiles, $Buffer);
   
@@ -242 +242 @@
   
     ';
-    $DbResult = $Database->query('SELECT * FROM `CzWoWPackageVersion` ORDER BY `Date` DESC');
+    $DbResult = $System->Database->query('SELECT * FROM `CzWoWPackageVersion` ORDER BY `Date` DESC');
     while($Line = $DbResult->fetch_assoc()) 
     {

trunk/export/export_output.php

@@ -103 +103 @@
 function OutputAddon($ExportId)
 {
-  global $Config, $Database, $System;
+  global $System;
   
   if(function_exists('gzcompress')) 
@@ -176 +176 @@
 function OutputDBCToFile($ExportId)
 {
-  global $Database, $System;
+  global $System;
   
   echo('<form action="?Action=View&amp;Tab=7&amp;ExportId='.$ExportId.'" method="post"><input type="submit" name="Regenerate" value="Přegenerovat"/></form><br />');
   echo('U DBC souborů export textů funguje jinak, protože generování je náročné, jsou požadavky zařazovány do fronty a postupně zpracovávány.<br />DBC soubory je nutné zabalit do souboru patch-enGB-5.MPQ uvnitř složky "DBFilesClient" a hru spouštět přes program wowme.exe (WoW Model Edit) u verzí klienta starší než 3.2.0. Od této verze již wowme není potřeba. Zabalit je můžete pomocí programu <a href="../download/mpqediten32.zip">Ladik\'s MPQ Editor</a>. Stav vygenerování můžete sledovat na této stránce.<br /><br />');
     
-  $DbResult = $Database->SQLCommand('SELECT * FROM ExportTask WHERE Export = '.$ExportId);
-  if(mysql_num_rows($DbResult) == 0)
-  {
-    $Database->SQLCommand('INSERT INTO ExportTask (`Export` ,`TimeStart` ) VALUES ('.$ExportId.', NOW())');
+  $DbResult = $System->Database->query('SELECT * FROM ExportTask WHERE Export = '.$ExportId);
+  if($DbResult->num_rows == 0)
+  {
+    $System->Database->query('INSERT INTO ExportTask (`Export` ,`TimeStart` ) VALUES ('.$ExportId.', NOW())');
     WriteLog('Zadání úlohy pro vygenerování dbc souboru', LOG_TYPE_DOWNLOAD);
   }  
@@ -190 +190 @@
   if(array_key_exists('Regenerate', $_POST))
   {
-    $Database->SQLCommand('UPDATE ExportTask SET TimeStart = NOW(), TimeFinish = NULL WHERE Export = '.$ExportId);
+    $System->Database->query('UPDATE ExportTask SET TimeStart = NOW(), TimeFinish = NULL WHERE Export = '.$ExportId);
     echo('Soubor zařazen znovu ke zpracování.<br/><br/>');
   }
-  $DbResult = $Database->SQLCommand('SELECT * FROM `ExportTask` WHERE `Export` = '.$ExportId);
-  $ExportTask = mysql_fetch_assoc($DbResult);
+  $DbResult = $System->Database->query('SELECT * FROM `ExportTask` WHERE `Export` = '.$ExportId);
+  $ExportTask = $DbResult->fetch_assoc();
   if($ExportTask['TimeFinish'] > $ExportTask['TimeStart'])
   {

trunk/export/index.php

@@ -6 +6 @@
 function ExportList()
 {
-  global $Database, $User;
+  global $System, $User;
   
   echo('<a href="?Action=ViewList">Všechny</a>');
@@ -22 +22 @@
   }
   
-  $DbResult = $Database->SQLCommand('SELECT COUNT(*) FROM `Export` '.$Filter);
-  $DbRow = mysql_fetch_row($DbResult);
+  $DbResult = $System->Database->query('SELECT COUNT(*) FROM `Export` '.$Filter);
+  $DbRow = $DbResult->fetch_row();
   $PageList = GetPageList($DbRow[0]);    
 
@@ -44 +44 @@
   echo($Order['Output']);
 
-  $DbResult = $Database->SQLCommand('SELECT `User`.`Name` AS `UserName`, `Export`.`Id`, `Export`.`TimeCreate`, `Export`.`Title`, `Export`.`User`, `Export`.`UsedCount`, (SELECT Version FROM `ClientVersion` WHERE `ClientVersion`.`Id`=`Export`.`ClientVersion`) AS `ClientVersion`,(SELECT Name FROM `ExportOutputType` WHERE `ExportOutputType`.`Id`=`Export`.`OutputType`) AS `OutputType`, (SELECT COUNT(*) FROM `ExportGroup` WHERE `ExportGroup`.`Export`=`Export`.`Id`) AS `GroupCount`, (SELECT COUNT(*) FROM `ExportUser` WHERE `ExportUser`.`Export`=`Export`.`Id`) AS `UserCount` FROM `Export` LEFT JOIN `User` ON `User`.`ID`=`Export`.`User` '.$Filter.$Order['SQL'].$PageList['SQLLimit']);
-  while($Export = mysql_fetch_assoc($DbResult))
+  $DbResult = $System->Database->query('SELECT `User`.`Name` AS `UserName`, `Export`.`Id`, `Export`.`TimeCreate`, `Export`.`Title`, `Export`.`User`, `Export`.`UsedCount`, (SELECT Version FROM `ClientVersion` WHERE `ClientVersion`.`Id`=`Export`.`ClientVersion`) AS `ClientVersion`,(SELECT Name FROM `ExportOutputType` WHERE `ExportOutputType`.`Id`=`Export`.`OutputType`) AS `OutputType`, (SELECT COUNT(*) FROM `ExportGroup` WHERE `ExportGroup`.`Export`=`Export`.`Id`) AS `GroupCount`, (SELECT COUNT(*) FROM `ExportUser` WHERE `ExportUser`.`Export`=`Export`.`Id`) AS `UserCount` FROM `Export` LEFT JOIN `User` ON `User`.`ID`=`Export`.`User` '.$Filter.$Order['SQL'].$PageList['SQLLimit']);
+  while($Export = $DbResult->fetch_assoc())
   {
     $Action = '<a href="?Action=View&amp;ExportId='.$Export['Id'].'&amp;Tab=0">Zobrazit</a> <a href="?Action=View&amp;ExportId='.$Export['Id'].'&amp;Tab=7">Exportovat</a>';
@@ -59 +59 @@
 function ExportCreate()
 {
-  global $Database, $Config, $User;
+  global $System, $User;
   
   if($User->Licence(LICENCE_USER))
   {   
-    $DbResult = $Database->SQLCommand('SELECT COUNT(*) FROM `Export` WHERE `User`='.$User->Id);
-    $DbRow = mysql_fetch_row($DbResult);
-    if($DbRow[0] < $Config['MaxExportPerUser'])
+    $DbResult = $System->Database->query('SELECT COUNT(*) FROM `Export` WHERE `User`='.$User->Id);
+    $DbRow = $DbResult->fetch_row();
+    if($DbRow[0] < $System->Config['MaxExportPerUser'])
     {
       echo('<form action="?Action=CreateFinish" method="post">'.
@@ -73 +73 @@
       '<tr><td colspan="2"><input type="submit" value="Vytvořit" /></td></tr>'.
       '</table></fieldset></form>');
-    } else echo('Nemůžete vytvářet další export. Max. počet na uživatele je '.$Config['MaxExportPerUser'].'.');
+    } else echo('Nemůžete vytvářet další export. Max. počet na uživatele je '.$System->Config['MaxExportPerUser'].'.');
   } else echo('Nemáte oprávnění');
 }
@@ -79 +79 @@
 function ExportCreateFinish()
 {
-  global $Database, $Config, $User, $System;
+  global $User, $System;
   
   if($User->Licence(LICENCE_USER))
@@ -85 +85 @@
     if(array_key_exists('Title', $_POST) and array_key_exists('Description', $_POST))
     {
-      $DbResult = $Database->SQLCommand('SELECT COUNT(*) FROM `Export` WHERE `User`='.$User->Id);
-      $DbRow = mysql_fetch_row($DbResult);
-      if($DbRow[0] < $Config['MaxExportPerUser'])
+      $DbResult = $System->Database->query('SELECT COUNT(*) FROM `Export` WHERE `User`='.$User->Id);
+      $DbRow = $DbResult->fetch_row();
+      if($DbRow[0] < $System->Config['MaxExportPerUser'])
       {
-        $Database->SQLCommand('INSERT INTO `Export` (`Title`, `User`, `TimeCreate`, `WithDiacritic`, `Description`) VALUES ("'.$_POST['Title'].'", '.$User->Id.', NOW(), 1, "'.$_POST['Description'].'")');
-        $ExportId = mysql_insert_id();
+        $System->Database->query('INSERT INTO `Export` (`Title`, `User`, `TimeCreate`, `WithDiacritic`, `Description`) VALUES ("'.$_POST['Title'].'", '.$User->Id.', NOW(), 1, "'.$_POST['Description'].'")');
+        $ExportId = $System->database->insert_id;
         echo('Nový export vytvořen.<br/>Přímý odkaz na tento export: <a href="?Action=View&amp;ExportId='.$ExportId.'">zde</a><br/><br/>');
         WriteLog('Vytvořen nový export <a href="'.$System->Link('/export/?Action=View&amp;ExportId='.$ExportId).'">'.$ExportId.'</a>.', LOG_TYPE_EXPORT);
         $_GET['Filter'] = 'my';
         ExportList();
-      } else echo('Nemůžete vytvářet další export. Max. počet na uživatele je '.$Config['MaxExportPerUser'].'.');
+      } else echo('Nemůžete vytvářet další export. Max. počet na uživatele je '.$System->Config['MaxExportPerUser'].'.');
     } else echo('Chybí údaje formuláře');
   } else echo('Nemáte oprávnění');
@@ -102 +102 @@
 function ExportDelete()
 {
-  global $Database, $User;
+  global $System, $User;
   
   if($User->Licence(LICENCE_USER))
   {   
-    $DbResult = $Database->SQLCommand('SELECT * FROM `Export` WHERE `Id`='.$_GET['ExportId'].' AND `User`='.$User->Id);
-    $Database->SQLCommand('DELETE FROM `Export` WHERE `Id`='.$_GET['ExportId']);
+    $System->Database->query('SELECT * FROM `Export` WHERE `Id`='.$_GET['ExportId'].' AND `User`='.$User->Id);
+    $System->Database->query('DELETE FROM `Export` WHERE `Id`='.$_GET['ExportId']);
     DeleteDirectory('../tmp/Export/'.$_GET['ExportId'].'/');
     echo('Export smazán.<br/><br/>');
@@ -118 +118 @@
 function ExportViewTranslators()
 {
-  global $Database, $TranslationTree, $Config, $User, $System;
+  global $TranslationTree, $User, $System;
 
   $DisabledInput = array(false => ' disabled="disabled"', true => '');
-  $DbRows = $Database->SQLCommand('SELECT * FROM `Export` WHERE `Id`='.$_GET['ExportId']);
-  $Export = mysql_fetch_assoc($DbRows);
+  $DbResult = $System->Database->query('SELECT * FROM `Export` WHERE `Id`='.$_GET['ExportId']);
+  $Export = $DbResult->fetch_assoc();
   if($User->Licence(LICENCE_USER) and ($User->Id == $Export['User'])) $Editable = true; 
     else $Editable = false;       
@@ -140 +140 @@
             else $Selected = false;
           $Condition = ' WHERE `Export`='.$_GET['ExportId'].' AND `User`='.$UserId;
-          $DbResult = $Database->SQLCommand('SELECT * FROM `ExportUser` '.$Condition);
-          if(mysql_num_rows($DbResult) > 0)
+          $DbResult = $System->Database->query('SELECT * FROM `ExportUser` '.$Condition);
+          if($DbResult->num_rows > 0)
           {
-            if(!$Selected) $Database->SQLCommand('DELETE FROM `ExportUser` '.$Condition);
-              else $Database->SQLCommand('UPDATE `ExportUser` SET `Sequence`='.$Value.$Condition);
+            if(!$Selected) $System->Database->query('DELETE FROM `ExportUser` '.$Condition);
+              else $System->Database->query('UPDATE `ExportUser` SET `Sequence`='.$Value.$Condition);
           } else
           {
-            if($Selected) $Database->SQLCommand('INSERT INTO `ExportUser` (`Export`, `User`, `Sequence`) VALUES ('.$_GET['ExportId'].', '.$UserId.', '.$Value.')');
+            if($Selected) $System->Database->query('INSERT INTO `ExportUser` (`Export`, `User`, `Sequence`) VALUES ('.$_GET['ExportId'].', '.$UserId.', '.$Value.')');
           }         
         }
@@ -153 +153 @@
       
       // Recalculate sequence number
-      $Database->SQLCommand('SET @I = 0');
-      $Database->SQLCommand('UPDATE `ExportUser` SET `Sequence` = (@I := @I + 1) WHERE `Export`='.$_GET['ExportId'].' ORDER BY `Sequence`;');
+      $System->Database->query('SET @I = 0');
+      $System->Database->query('UPDATE `ExportUser` SET `Sequence` = (@I := @I + 1) WHERE `Export`='.$_GET['ExportId'].' ORDER BY `Sequence`;');
     }
   }
@@ -174 +174 @@
   $Query .=' WHERE `T`.`TranslatedCount` > 0 ORDER BY COALESCE(`ExportUser`.`Sequence`, 100000000)'.$InitialOrder.') AS `TT`';
 
-  $DbResult = $Database->SQLCommand('SELECT COUNT(*) FROM ('.$Query.') AS `X`');
-  $DbRow = mysql_fetch_row($DbResult);
+  $DbResult = $System->Database->query('SELECT COUNT(*) FROM ('.$Query.') AS `X`');
+  $DbRow = $DbResult->fetch_row();
   $PageList = GetPageList($DbRow[0]);    
   
@@ -194 +194 @@
 
   $Query = 'SELECT * FROM ('.$Query.') AS `TX` '.$Order['SQL'].$PageList['SQLLimit'];
-  $Database->SQLCommand('SET @I = 0');
-  $DbResult = $Database->SQLCommand($Query);
-  while($UserLine = mysql_fetch_assoc($DbResult))
+  $System->Database->query('SET @I = 0');
+  $DbResult = $System->Database->query($Query);
+  while($UserLine = $DbResult->fetch_assoc())
   {
     $XP = GetLevelMinMax($UserLine['XP']);
@@ -216 +216 @@
 function ExportViewGeneral()
 {
-  global $Database, $User;
+  global $System, $User;
   
   $DisabledInput = array(false => ' disabled="disabled"', true => '');
   $DisabledTextArea = array(false => ' readonly="yes"', true => '');
   echo('<h3>Obecná nastavení</h3>');
-  $DbRows = $Database->SQLCommand('SELECT * FROM `Export` WHERE `Id`='.$_GET['ExportId']);
-  $Export = mysql_fetch_assoc($DbRows);
+  $DbRows = $System->Database->query('SELECT * FROM `Export` WHERE `Id`='.$_GET['ExportId']);
+  $Export = $DbRows->fetch_assoc();
   if($User->Licence(LICENCE_USER) and ($User->Id == $Export['User'])) $Editable = true; 
     else $Editable = false;
@@ -229 +229 @@
     if(array_key_exists('WithDiacritic', $_POST)) $WithDiacritic = 1; 
       else $WithDiacritic = 0;
-    $Database->SQLCommand('UPDATE `Export` SET `Title`="'.$_POST['Title'].'", `Description`="'.$_POST['Description'].'", `WithDiacritic`='.$WithDiacritic.' WHERE Id='.$Export['Id']);
+    $System->Database->query('UPDATE `Export` SET `Title`="'.$_POST['Title'].'", `Description`="'.$_POST['Description'].'", `WithDiacritic`='.$WithDiacritic.' WHERE Id='.$Export['Id']);
     $Export['Title'] = $_POST['Title'];
     $Export['Description'] = $_POST['Description'];
@@ -250 +250 @@
 function ExportViewLanguages()
 {
-  global $Database, $TranslationTree, $Config, $User;
+  global $System, $TranslationTree, $User;
 
   $DisabledInput = array(false => ' disabled="disabled"', true => '');
-  $DbRows = $Database->SQLCommand('SELECT * FROM `Export` WHERE `Id`='.$_GET['ExportId']);
-  $Export = mysql_fetch_assoc($DbRows);
+  $DbRows = $System->Database->query('SELECT * FROM `Export` WHERE `Id`='.$_GET['ExportId']);
+  $Export = $DbRows->fetch_assoc();
   if($User->Licence(LICENCE_USER) and ($User->Id == $Export['User'])) $Editable = true; 
     else $Editable = false;
@@ -272 +272 @@
             else $Selected = false;
           $Condition = ' WHERE Export='.$_GET['ExportId'].' AND `Language`='.$LanguageId;
-          $DbResult = $Database->SQLCommand('SELECT * FROM `ExportLanguage` '.$Condition);
-          if(mysql_num_rows($DbResult) > 0)
+          $DbResult = $System->Database->query('SELECT * FROM `ExportLanguage` '.$Condition);
+          if($DbResult->num_rows > 0)
           {
-            if(!$Selected) $Database->SQLCommand('DELETE FROM `ExportLanguage` '.$Condition);
-              else $Database->SQLCommand('UPDATE `ExportLanguage` SET `Sequence`='.$Value.$Condition);
+            if(!$Selected) $System->Database->query('DELETE FROM `ExportLanguage` '.$Condition);
+              else $System->Database->query('UPDATE `ExportLanguage` SET `Sequence`='.$Value.$Condition);
           } else
           {
-            if($Selected) $Database->SQLCommand('INSERT INTO `ExportLanguage` (`Export`, `Language`, `Sequence`) VALUES ('.$_GET['ExportId'].', '.$LanguageId.', '.$Value.')');
+            if($Selected) $System->Database->query('INSERT INTO `ExportLanguage` (`Export`, `Language`, `Sequence`) VALUES ('.$_GET['ExportId'].', '.$LanguageId.', '.$Value.')');
           }         
         }
@@ -285 +285 @@
       
       // Recalculate sequence number
-      $Database->SQLCommand('SET @I = 0');
-      $Database->SQLCommand('UPDATE `ExportLanguage` SET `Sequence` = (@I := @I + 1) WHERE `Export`='.$_GET['ExportId'].' ORDER BY `Sequence`;');
+      $System->Database->query('SET @I = 0');
+      $System->Database->query('UPDATE `ExportLanguage` SET `Sequence` = (@I := @I + 1) WHERE `Export`='.$_GET['ExportId'].' ORDER BY `Sequence`;');
     }
   }
@@ -294 +294 @@
   $Query .=' WHERE `Language`.`Enabled` = 1 ORDER BY COALESCE(`Sequence`, 100)';
 
-  $DbResult = $Database->SQLCommand('SELECT COUNT(*) FROM ('.$Query.') AS X');
-  $DbRow = mysql_fetch_row($DbResult);
+  $DbResult = $System->Database->query('SELECT COUNT(*) FROM ('.$Query.') AS X');
+  $DbRow = $DbResult->fetch_row();
   $PageList = GetPageList($DbRow[0]);    
   
@@ -319 +319 @@
 
   $Query = 'SELECT * FROM ('.$Query.') AS TX '.$Order['SQL'].$PageList['SQLLimit'];
-  $Database->SQLCommand('SET @I = 0');
-  $DbResult = $Database->SQLCommand($Query);
-  while($Langugage = mysql_fetch_assoc($DbResult))
+  $System->Database->query('SET @I = 0');
+  $DbResult = $System->Database->query($Query);
+  while($Langugage = $DbResult->fetch_assoc())
   {
     $Checked = $Langugage['Sequence'] != '';
@@ -337 +337 @@
 function ExportViewGroups()
 {
-  global $Database, $TranslationTree, $Config, $User;
+  global $System, $TranslationTree, $User;
 
   $DisabledInput = array(false => ' disabled="disabled"', true => '');
-  $DbRows = $Database->SQLCommand('SELECT * FROM Export WHERE Id='.$_GET['ExportId']);
-  $Export = mysql_fetch_assoc($DbRows);
+  $DbRows = $System->Database->query('SELECT * FROM Export WHERE Id='.$_GET['ExportId']);
+  $Export = $DbRows->fetch_assoc();
   if($User->Licence(LICENCE_USER) and ($User->Id == $Export['User'])) $Editable = true; 
     else $Editable = false;
@@ -359 +359 @@
             else $Selected = false;
           $Condition = ' WHERE `Export`='.$_GET['ExportId'].' AND `Group`='.$GroupId;
-          $DbResult = $Database->SQLCommand('SELECT * FROM `ExportGroup` '.$Condition);
-          if(mysql_num_rows($DbResult) > 0)
+          $DbResult = $System->Database->query('SELECT * FROM `ExportGroup` '.$Condition);
+          if($DbResult->num_rows > 0)
           {
-            if(!$Selected) $Database->SQLCommand('DELETE FROM `ExportGroup` '.$Condition);
+            if(!$Selected) $System->Database->query('DELETE FROM `ExportGroup` '.$Condition);
           } else
           {
-            if($Selected) $Database->SQLCommand('INSERT INTO `ExportGroup` (`Export`, `Group`) VALUES ('.$_GET['ExportId'].', '.$GroupId.')');
+            if($Selected) $System->Database->query('INSERT INTO `ExportGroup` (`Export`, `Group`) VALUES ('.$_GET['ExportId'].', '.$GroupId.')');
           }         
         }
@@ -374 +374 @@
   $Query = 'SELECT `Group`.*, `ExportGroup`.`Id` AS `ExportGroupId` FROM `Group` LEFT JOIN `ExportGroup` ON `ExportGroup`.`Export`='.$_GET['ExportId'].' AND `Group`=`Group`.`Id`';
 
-  $DbResult = $Database->SQLCommand('SELECT COUNT(*) FROM ('.$Query.') AS X');
-  $DbRow = mysql_fetch_row($DbResult);
+  $DbResult = $System->Database->query('SELECT COUNT(*) FROM ('.$Query.') AS X');
+  $DbRow = $DbResult->fetch_row();
   $PageList = GetPageList($DbRow[0]);    
   
@@ -401 +401 @@
 
   $Query = 'SELECT * FROM ('.$Query.') AS TX '.$Order['SQL'].$PageList['SQLLimit'];
-  $DbResult = $Database->SQLCommand($Query);
-  while($Group = mysql_fetch_assoc($DbResult))
+  $DbResult = $System->Database->query($Query);
+  while($Group = $DbResult->fetch_assoc())
   {
     $Checked = $Group['ExportGroupId'] != '';
@@ -420 +420 @@
 function ExportViewOutputFormat()
 {
-  global $Database, $User;
+  global $System, $User;
   
   $DisabledInput = array(false => ' disabled="disabled"', true => '');
   if(array_key_exists('ExportId', $_GET))
   {
-    $DbRows = $Database->SQLCommand('SELECT * FROM `Export` WHERE `Id`='.$_GET['ExportId']);
-    if(mysql_num_rows($DbRows) > 0)
+    $DbRows = $System->Database->query('SELECT * FROM `Export` WHERE `Id`='.$_GET['ExportId']);
+    if($DbRows->num_rows > 0)
     {    
-      $Export = mysql_fetch_assoc($DbRows);
+      $Export = $DbRows->fetch_assoc();
       if($User->Licence(LICENCE_USER) and ($User->Id == $Export['User'])) $Editable = true; 
         else $Editable = false;
@@ -434 +434 @@
   if(array_key_exists('OutputType', $_POST))
   {
-    $Database->SQLCommand('UPDATE Export SET OutputType='.$_POST['OutputType'].' WHERE Id='.$_GET['ExportId']);
-  }
-
-  $DbResult = $Database->SQLCommand('SELECT * FROM `Export` WHERE `Id`='.$_GET['ExportId']);
-  $Export = mysql_fetch_assoc($DbResult);
+    $System->Database->query('UPDATE Export SET OutputType='.$_POST['OutputType'].' WHERE Id='.$_GET['ExportId']);
+  }
+
+  $DbResult = $System->Database->query('SELECT * FROM `Export` WHERE `Id`='.$_GET['ExportId']);
+  $Export = $DbResult->fetch_assoc();
   
   echo('<h3>Formát generovaného výstupu</h3>');
@@ -447 +447 @@
     '<br />');
   }
-  $DbResult = $Database->SQLCommand('SELECT * FROM `ExportOutputType` ORDER BY `Name`');
-  while($ExportFormat = mysql_fetch_assoc($DbResult))
+  $DbResult = $System->Database->query('SELECT * FROM `ExportOutputType` ORDER BY `Name`');
+  while($ExportFormat = $DbResult->fetch_assoc())
   {
     echo(RadioButton('OutputType', $ExportFormat['Id'], $Export['OutputType'] == $ExportFormat['Id'], '', !$Editable).' '.$ExportFormat['Name'].'<br/>');
@@ -459 +459 @@
 function ExportViewVersion()
 {
-  global $Database, $Config, $User;
+  global $System, $User;
 
   $DisabledInput = array(false => ' disabled="disabled"', true => '');
-  $DbRows = $Database->SQLCommand('SELECT * FROM `Export` WHERE `Id`='.$_GET['ExportId']);
-  $Export = mysql_fetch_assoc($DbRows);
+  $DbRows = $System->Database->query('SELECT * FROM `Export` WHERE `Id`='.$_GET['ExportId']);
+  $Export = $DbRows->fetch_assoc();
   if($User->Licence(LICENCE_USER) and ($User->Id == $Export['User'])) $Editable = true; 
     else $Editable = false;
@@ -469 +469 @@
   if(array_key_exists('ClientVersion', $_POST))
   {
-    $Database->SQLCommand('UPDATE `Export` SET `ClientVersion`='.$_POST['ClientVersion'].' WHERE `Id`='.$_GET['ExportId']);
-  }
-
-  $DbResult = $Database->SQLCommand('SELECT * FROM `Export` WHERE `Id`='.$_GET['ExportId']);
-  $Export = mysql_fetch_assoc($DbResult);
+    $System->Database->query('UPDATE `Export` SET `ClientVersion`='.$_POST['ClientVersion'].' WHERE `Id`='.$_GET['ExportId']);
+  }
+
+  $DbResult = $System->Database->query('SELECT * FROM `Export` WHERE `Id`='.$_GET['ExportId']);
+  $Export = $DbResult->fetch_assoc();
 
   $Query = 'SELECT `ClientVersion`.* FROM `ExportVersion` LEFT JOIN `ClientVersion` ON `ClientVersion`.`Id`=`ExportVersion`.`ClientVersion` WHERE `ExportType`='.$Export['OutputType'];
 
-  $DbResult = $Database->SQLCommand('SELECT COUNT(*) FROM ('.$Query.') AS `X`');
-  $DbRow = mysql_fetch_row($DbResult);
+  $DbResult = $System->Database->query('SELECT COUNT(*) FROM ('.$Query.') AS `X`');
+  $DbRow = $DbResult->fetch_row();
   $PageList = GetPageList($DbRow[0]);    
   
@@ -503 +503 @@
 
   $Query = 'SELECT * FROM ('.$Query.') AS `TX` '.$Order['SQL'].$PageList['SQLLimit'];
-  $DbResult = $Database->SQLCommand($Query);
-  while($Version = mysql_fetch_assoc($DbResult))
+  $DbResult = $System->Database->query($Query);
+  while($Version = $DbResult->fetch_assoc())
   {
     echo('<tr><td><a href="http://www.wowwiki.com/Patch_'.$Version['Version'].'">'.$Version['Version'].'</a></td><td>'.$Version['BuildNumber'].'</td><td>'.HumanDate($Version['ReleaseDate']).'</td><td>'.$Version['Title'].'</td><td>'.RadioButton('ClientVersion', $Version['Id'], $Export['ClientVersion'] == $Version['Id'], '', !$Editable
@@ -517 +517 @@
 function ExportViewOutput()
 {
-  global $Database;
-  
-  $DbResult = $Database->SQLCommand('SELECT * FROM `Export` WHERE `Id`='.$_GET['ExportId']);
-  $Export = mysql_fetch_assoc($DbResult);
-  $DbResult = $Database->SQLCommand('SELECT * FROM `ExportOutputType` WHERE `Id`='.$Export['OutputType']);
-  if(mysql_num_rows($DbResult) > 0)
-  {
-    $DbResult = $Database->SQLCommand('SELECT * FROM `ExportVersion` WHERE `ExportType`='.$Export[ 'OutputType'].' AND `ClientVersion`='.$Export['ClientVersion']);
-    if(mysql_num_rows($DbResult) > 0)
+  global $System;
+  
+  $DbResult = $System->Database->query('SELECT * FROM `Export` WHERE `Id`='.$_GET['ExportId']);
+  $Export = $DbResult->fetch_assoc();
+  $DbResult = $System->Database->query('SELECT * FROM `ExportOutputType` WHERE `Id`='.$Export['OutputType']);
+  if($DbResult->num_rows > 0)
+  {
+    $DbResult = $System->Database->query('SELECT * FROM `ExportVersion` WHERE `ExportType`='.$Export[ 'OutputType'].' AND `ClientVersion`='.$Export['ClientVersion']);
+    if($DbResult->num_rows > 0)
     {  
-      $Database->SQLCommand('UPDATE Export SET UsedCount = UsedCount + 1 WHERE Id='.$Export['Id']);
+      $System->Database->query('UPDATE Export SET UsedCount = UsedCount + 1 WHERE Id='.$Export['Id']);
       ExportOutput($Export['Id'], $Export['OutputType']);
     } else echo('Nebyla vybrána požadovaná verze klienta');
@@ -535 +535 @@
 function ExportViewStat()
 {
-  global $Database, $System;
+  global $System;
 
   $Export = new Export($System);
@@ -547 +547 @@
   $Query = '';
   $UnionItems = array();
-  $DbResult = $Database->SQLCommand($GroupListQuery);
-  while($DbRow = mysql_fetch_assoc($DbResult))
+  $DbResult = $System->Database->query($GroupListQuery);
+  while($DbRow = $DbResult->fetch_assoc())
   {
     $UnionItems[] = 'SELECT (SELECT COUNT(DISTINCT(`Entry`)) FROM ('.
@@ -563 +563 @@
   $Query = substr($Query, 0, - 6);
 
-  $DbResult = $Database->SQLCommand('SELECT COUNT(*) FROM ('.$GroupListQuery.') AS `T`');
-  $DbRow = mysql_fetch_row($DbResult);
+  $DbResult = $System->Database->query('SELECT COUNT(*) FROM ('.$GroupListQuery.') AS `T`');
+  $DbRow = $DbResult->fetch_row();
   $PageList = GetPageList($DbRow[0]);  
   echo('<h3>Statistika dokončení vybraných skupin</h3>');
@@ -584 +584 @@
   if(count($UnionItems) > 0)
   {
-    $ID = $Database->SQLCommand('SELECT *, ROUND(`Translated` / `Total` * 100, 2) AS `Percent` FROM ('.implode(' UNION ALL ', $UnionItems).') AS `C3` '.$Order['SQL'].$PageList['SQLLimit']);
-    while($Group = mysql_fetch_assoc($ID)) 
+    $ID = $System->Database->query('SELECT *, ROUND(`Translated` / `Total` * 100, 2) AS `Percent` FROM ('.implode(' UNION ALL ', $UnionItems).') AS `C3` '.$Order['SQL'].$PageList['SQLLimit']);
+    while($Group = $ID->fetch_assoc()) 
     {
       echo('<tr><td>'.$Group['Name'].'</td><td>'.$Group['Translated'].'</td><td>'.$Group['Total'].'</td><td>'.ProgressBar(150, $Group['Percent']).'</td></tr>');
@@ -601 +601 @@
 function ExportView()
 {
-  global $Database;
+  global $System;
 
   if(array_key_exists('ExportId', $_GET) and is_numeric($_GET['ExportId']))
   {
-    $DbResult = $Database->SQLCommand('SELECT * FROM `Export` WHERE `Id`='.$_GET['ExportId']);
-    if(mysql_num_rows($DbResult) > 0)
+    $DbResult = $System->Database->query('SELECT * FROM `Export` WHERE `Id`='.$_GET['ExportId']);
+    if($DbResult->num_rows > 0)
     {    
-      $Export = mysql_fetch_assoc($DbResult);
-  
-      $DbResult = $Database->SQLCommand('SELECT * FROM `User` WHERE `ID`='.$Export['User']);
-      $UserLine = mysql_fetch_assoc($DbResult);
+      $Export = $DbResult->fetch_assoc();
+  
+      $DbResult = $System->Database->query('SELECT * FROM `User` WHERE `ID`='.$Export['User']);
+      $UserLine = $DbResult->fetch_assoc();
       echo('Export <strong><a href="?Action=View&amp;Tab=6&amp;ExportId='.$Export['Id'].'">'.$_GET['ExportId'].'</a></strong> překladatele <strong>'.$UserLine['Name'].'</strong> s označením <strong>'.$Export['Title'].'</strong>');
       ShowTabs(array('Obecné', 'Překladatelé', 'Překlady', 'Jazyky', 'Formát', 'Verze', 'Statistika', 'Výstup'));

trunk/export/process_aowow_export.php

@@ -16 +16 @@
 // Rebuild user selection
 $UserSelection = array();
-$DbResult = $Database->SQLCommand('SELECT `ID`, `XP` FROM `User`');
-while($DbRow = mysql_fetch_assoc($DbResult))
+$DbResult = $System->Database->query('SELECT `ID`, `XP` FROM `User`');
+while($DbRow = $DbResult->fetch_assoc())
 {
   $UserSelection[$DbRow['ID']] = $DbRow['XP'];
@@ -27 +27 @@
 foreach($UserSelection as $ID => $XP)
 {
-  $DbResult = $Database->SQLCommand('SELECT `Id` FROM `ExportUser` WHERE `Export` = '.$Config['AoWoWExportId'].' AND `User` = '.$ID);
-  if(mysql_num_rows($DbResult) > 0)
+  $DbResult = $System->Database->query('SELECT `Id` FROM `ExportUser` WHERE `Export` = '.$Config['AoWoWExportId'].' AND `User` = '.$ID);
+  if($DbResult->num_rows > 0)
     $Query = 'UPDATE `ExportUser` SET `Sequence` = '.$Sequence.' WHERE `Export` = '.$Config['AoWoWExportId'].' AND `User` = '.$ID;
     else $Query = 'INSERT INTO `ExportUser` (`Export`, `User`, `Sequence`) VALUES ('.$Config['AoWoWExportId'].', '.$ID.', '.$Sequence.')';
-  $Database->SQLCommand($Query);
+  $System->Database->query($Query);
   $Sequence++;
 }

trunk/export/process_task.php

@@ -12 +12 @@
 while(1)
 {
-  $DbResult = $Database->SQLCommand('SELECT `ExportTask`.`Export`, `Export`.`Id` AS `ExportId` FROM `ExportTask` LEFT JOIN `Export` ON `Export`.`Id` = `ExportTask`.`Export` WHERE `ExportTask`.`TimeFinish` IS NULL');
-  while($DbRow = mysql_fetch_assoc($DbResult)) 
+  $DbResult = $System->Database->query('SELECT `ExportTask`.`Export`, `Export`.`Id` AS `ExportId` FROM `ExportTask` LEFT JOIN `Export` ON `Export`.`Id` = `ExportTask`.`Export` WHERE `ExportTask`.`TimeFinish` IS NULL');
+  while($DbRow = $DbResult->fetch_assoc()) 
   {
     echo(StrFTime("%d/%m/%Y %H:%M:%S", time()).': Generování DBC souborů pro export '.$DbRow['ExportId'].'.. '."\n");
@@ -44 +44 @@
           echo('Hotovo'."\n");
         } else echo('Funkce pro tvorbu Zip souboru není podporována!'."\n");
-        $Database->SQLCommand('UPDATE `ExportTask` SET `TimeFinish`=NOW() WHERE `Export`='.$Export->Id);
+        $System->Database->query('UPDATE `ExportTask` SET `TimeFinish`=NOW() WHERE `Export`='.$Export->Id);
       } catch (Exception $e) 
       {
@@ -51 +51 @@
     } else
     {
-      $Database->SQLCommand('DELETE FROM `ExportTask` WHERE `Export`='.$DbRow['Export']);
+      $System->Database->query('DELETE FROM `ExportTask` WHERE `Export`='.$DbRow['Export']);
       echo('Export '.$DbRow['Export'].' nenalezen. Jeho úloha smazána.'."\n");
     }