Changeset 455 for trunk

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

Files:

• Options.php (modified) (3 diffs)
• TranslationList.php (modified) (3 diffs)
• action.php (modified) (14 diffs)
• admin.php (modified) (4 diffs)
• banners.php (modified) (1 diff)
• comparison.php (modified) (2 diffs)
• dictionary.php (modified) (7 diffs)
• export/create_addon.php (modified) (3 diffs)
• export/export_output.php (modified) (3 diffs)
• export/index.php (modified) (36 diffs)
• export/process_aowow_export.php (modified) (2 diffs)
• export/process_task.php (modified) (3 diffs)
• form.php (modified) (4 diffs)
• img_level.php (modified) (5 diffs)
• img_statistic.php (modified) (1 diff)
• import/import.php (modified) (12 diffs)
• import/index.php (modified) (6 diffs)
• includes/Database.php (modified) (1 diff)
• includes/databaseconection.php (deleted)
• includes/global.php (modified) (12 diffs)
• includes/global_function.php (modified) (10 diffs)
• includes/system.php (modified) (2 diffs)
• index.php (modified) (4 diffs)
• log.php (modified) (4 diffs)
• registrace.php (modified) (2 diffs)
• save.php (modified) (2 diffs)
• statistic.php (modified) (6 diffs)
• team.php (modified) (16 diffs)
• user.php (modified) (1 diff)
• userlist.php (modified) (2 diffs)
• version.php (modified) (2 diffs)

trunk/Options.php

@@ -17 +17 @@
     if($NewPass == $NewPass2) 
     {
-      $DbResult = $Database->SQLCommand('SELECT `Pass`, '.$User->CryptPasswordSQL('"'.$OldPass.'"', '`Salt`').' AS `Hash` FROM `User` WHERE `ID`= '.$User->Id);
-      $DbRow = mysql_fetch_assoc($DbResult);
+      $DbResult = $System->Database->query('SELECT `Pass`, '.$User->CryptPasswordSQL('"'.$OldPass.'"', '`Salt`').' AS `Hash` FROM `User` WHERE `ID`= '.$User->Id);
+      $DbRow = $DbResult->fetch_assoc();
       if($DbRow['Hash'] == $DbRow['Pass'])
       {      
         // Update password
         $Salt = $User->GetPasswordSalt();
-        $Database->SQLCommand('UPDATE `User` SET `Pass` = '.$User->CryptPasswordSQL('"'.$NewPass.'"', '"'.$Salt.'"').', `Salt`="'.$Salt.'" WHERE `ID` = '.$User->Id);
+        $System->Database->query('UPDATE `User` SET `Pass` = '.$User->CryptPasswordSQL('"'.$NewPass.'"', '"'.$Salt.'"').', `Salt`="'.$Salt.'" WHERE `ID` = '.$User->Id);
         echo('Heslo změněno!<br />');
       } else echo('<br />Staré heslo neodpovídá!<br />');
     } else echo('<br />Hesla se neshodují!<br />');
     
-    $Database->SQLCommand('UPDATE `User` SET `Email` = "'.$Email.'", `Language` = "'.$Language.'", `Redirecting` = "'.$Redirecting.'" WHERE `ID` = '.$User->Id);
+    $System->Database->query('UPDATE `User` SET `Email` = "'.$Email.'", `Language` = "'.$Language.'", `Redirecting` = "'.$Redirecting.'" WHERE `ID` = '.$User->Id);
     echo('Úprava nastavení proběhla v pořádku, Email: <b>'.$Email.'</b> Uživatel: <b>'.$User->Name.'</b><br />');
     WriteLog('Úprava nastavení!', LOG_TYPE_USER);
@@ -84 +84 @@
 
     echo('  <fieldset><legend>Překladatelský tým</legend>');
-    $ID = $Database->SQLCommand('SELECT * FROM `Team`');
+    $DbResult = $System->Database->query('SELECT * FROM `Team`');
     echo('<a href="team.php?action=create">Vytvořit tým</a><br />'.
       '<a href="team.php?action=leave">Opustit tým</a><br />'.
@@ -90 +90 @@
       '<input type="hidden" name="action" value="gointeam"/>'.
       '<select name="id">');
-    while($LineTeam = mysql_fetch_assoc($ID)) 
+    while($LineTeam = $DbResult->fetch_assoc()) 
     {
       echo('<option value="'.$LineTeam['Id'].'"'); 

trunk/TranslationList.php

@@ -249 +249 @@
 function ShowGroupTypeList()
 {
-  global $Database, $User;
-  
-  $DbResult = $Database->SQLCommand('SELECT COUNT(*) FROM `Group`');
-  $DbRow = mysql_fetch_row($DbResult);
+  global $System, $User;
+  
+  $DbResult = $System->Database->query('SELECT COUNT(*) FROM `Group`');
+  $DbRow = $DbResult->fetch_row();
   $PageList = GetPageList($DbRow[0]);  
   echo('<h3>Seznam překladových skupin</h3>');
@@ -269 +269 @@
   echo($Order['Output']);
 
-  $ID = $Database->SQLCommand('SELECT * FROM `Group`'.$Order['SQL'].$PageList['SQLLimit']);
-  while($Group = mysql_fetch_assoc($ID)) 
+  $DbResult = $System->Database->query('SELECT * FROM `Group`'.$Order['SQL'].$PageList['SQLLimit']);
+  while($Group = $DbResult->fetch_assoc()) 
   {
     echo('<tr><td><a href="?group='.$Group['Id'].'&amp;action=filter">'.$Group['Name'].'</a></td><td>'.$Group['SourceType'].'</td><td>');
@@ -285 +285 @@
 function ShowMenu()
 {
-  global $Database, $User, $TranslationTree;
+  global $User, $TranslationTree;
   
   $GroupId = GetParameter('group', 0, true);

trunk/action.php

@@ -5 +5 @@
 function Search()
 {
-  global $Database, $TranslationTree;
+  global $System, $TranslationTree;
   
   if(array_key_exists('search', $_GET)) $Search = $_GET['search'];
@@ -22 +22 @@
       if($Item['Column'] != '') $sql .= ' OR `'.$Item['Column'].'` LIKE "%'.$Search.'%"';
     }
-    $Line = mysql_fetch_row($Database->SQLCommand($sql));
+    $DbResult = $System->Database->query($sql);
+    $Line = $DbResult->fetch_row();
     echo('<tr><td><a href="TranslationList.php?group='.$Group['Id'].'&amp;user=0&amp;state=0&amp;text='.$Search.'&amp;entry=">'.$Group['Name'].'</a></td><td>'.$Line[0].'</td></tr>');
   }
   
-    $Line = mysql_fetch_row($Database->SQLCommand('SELECT count(*) FROM `User` WHERE `Name` LIKE "%'.$Search.'%"'));
+  $DbResult = $System->Database->query('SELECT count(*) FROM `User` WHERE `Name` LIKE "%'.$Search.'%"');
+  $Line = $DbResult->fetch_row();
   echo('<tr><td><a href="userlist.php?search='.$Search.'">Uživatelé</a></td><td>'.$Line[0].'</td></tr>');
-    $Line = mysql_fetch_row($Database->SQLCommand('SELECT count(*) FROM `Team` WHERE `Name` LIKE "%'.$Search.'%" OR `Description` LIKE "%'.$Search.'%"'));
+  
+  $DbResult = $System->Database->query('SELECT count(*) FROM `Team` WHERE `Name` LIKE "%'.$Search.'%" OR `Description` LIKE "%'.$Search.'%"');
+  $Line = $DbResult->fetch_row();
   echo('<tr><td><a href="team.php?search='.$Search.'">Týmy</a></td><td>'.$Line[0].'</td></tr>');
-    $Line = mysql_fetch_row($Database->SQLCommand('SELECT count(*) FROM `CzWoWPackageVersion` WHERE `Text` LIKE "%'.$Search.'%"'));
+  
+  $DbResult = $System->Database->query('SELECT count(*) FROM `CzWoWPackageVersion` WHERE `Text` LIKE "%'.$Search.'%"');
+  $Line = $DbResult->fetch_row();
   echo('<tr><td><a href="download.php?addon">Čeština pro klienta</a></td><td>'.$Line[0].'</td></tr>');
   echo('<tr><td><a href="aowow/?search='.$Search.'">Vyhledávací databáze AoWoW</a></td></tr>');
-    $Line = mysql_fetch_row($Database->SQLCommand('SELECT count(*) FROM `Dictionary` WHERE (`Text` LIKE "%'.$Search.'%" OR `Description` LIKE "%'.$Search.'%") AND `Language` = 0'));
+  
+  $DbResult = $System->Database->query('SELECT count(*) FROM `Dictionary` WHERE (`Text` LIKE "%'.$Search.'%" OR `Description` LIKE "%'.$Search.'%") AND `Language` = 0');
+  $Line = $DbResult->fetch_row();
   echo('<tr><td><a href="dictionary.php?search='.$Search.'">Slovníček</a></td><td>'.$Line[0].'</td></tr>');
   
@@ -41 +49 @@
 function DatabaseKit()
 {
-  global $Database, $TranslationTree, $User;
+  global $System, $TranslationTree, $User;
   
   if($User->Licence(LICENCE_ADMIN)) 
@@ -61 +69 @@
     {
       $sql = 'DELETE FROM `Log` WHERE `Type` = '.$_POST['Type'];
-      $Database->SQLCommand($sql);
+      $System->Database->query($sql);
       WriteLog('Vymazán log '.$_POST['Type'], LOG_TYPE_MODERATOR);
       echo(' Vymazán log '.$_POST['Type']);
@@ -85 +93 @@
         $sql .= ')';
       
-        $ID = $Database->SQLCommand($sql);
-        while ($Line = mysql_fetch_assoc($ID)) 
+        $DbResult = $System->Database->query($sql);
+        while ($Line = $DbResult->fetch_assoc()) 
         {
           $sql = 'UPDATE '.$Table.' SET ';
@@ -96 +104 @@
           $sql = substr($sql,0,strlen($sql)-1);
           $sql .= ' WHERE `ID` = '.$Line['ID'];
-          $Database->SQLCommand($sql);
+          $System->Database->query($sql);
           echo ('.');
         }
@@ -123 +131 @@
       FROM `'.$Table.'` AS `Tran` WHERE (`Language` <> 0) AND ((`Take` = 0) OR (`ID` = `Take`) OR NOT EXISTS(SELECT 1 FROM `'.$Table.'` WHERE `ID` = `Tran`.`Take`))';
       
-        $ID = $Database->SQLCommand($sql);
-        while($Line = mysql_fetch_assoc($ID)) 
+        $DbResult = $System->Database->query($sql);
+        while($Line = $DbResult->fetch_assoc()) 
         {
           $sql = 'UPDATE `'.$Table.'` SET `Take` = '.$Line['IDOrig'].' WHERE `ID` = '.$Line['ID'];
-          $Database->SQLCommand($sql);
+          $System->Database->query($sql);
           echo('.');
         }
@@ -150 +158 @@
         echo ($Table.' ');
         $sql = 'SELECT `gs_orig`.`ID`, `gs_tran`.`Entry`, `gs_tran`.`ShortCut` AS `ShortCut_tran`, `gs_orig`.`ShortCut`  AS `ShortCut_orig` FROM `'.$Table.'` AS `gs_tran` JOIN `'.$Table.'` AS `gs_orig` ON `gs_orig`.`Entry` = `gs_tran`.`Entry` WHERE `gs_tran`.`Language` <> 0 AND `gs_tran`.`ShortCut` <> `gs_orig`.`ShortCut`';     
-        $ID = $Database->SQLCommand($sql);
-        while ($Line = mysql_fetch_assoc($ID)) 
+        $DbResult = $System->Database->query($sql);
+        while ($Line = $DbResult->fetch_assoc()) 
         {
           $sql = 'UPDATE `'.$Table.'` SET `ShortCut` = '.$Line['ShortCut_orig'].' WHERE `ID` = '.$Line['ID'];
-          $Database->SQLCommand($sql);
+          $System->Database->query($sql);
           echo ('.');
         }
     
         echo (' <strong>Hotovo</strong> <br />');
-        if(mysql_num_rows($ID) > 0) 
-        {
-          WriteLog('Použita oprava DB na sloupec ShortCut '.mysql_num_rows($ID).' řádků z tabulky '.$Table, LOG_TYPE_MODERATOR);
-          echo (' Použita oprava DB na sloupec ShortCut '.mysql_num_rows($ID).' řádků z tabulky '.$Table.'<br />');
+        if($DbResult->num_rows > 0) 
+        {
+          WriteLog('Použita oprava DB na sloupec ShortCut '.$DbResult->num_rows.' řádků z tabulky '.$Table, LOG_TYPE_MODERATOR);
+          echo (' Použita oprava DB na sloupec ShortCut '.$DbResult->num_rows.' řádků z tabulky '.$Table.'<br />');
         }
       }
@@ -171 +179 @@
 function Delete()
 {
-  global $Database, $User;
+  global $System, $User;
   
   if($User->Licence(LICENCE_MODERATOR)) 
   {
     $TextID = $_GET['ID'];       
-    $Database->SQLCommand('DELETE FROM `'.$Table.'` WHERE `ID` = '.$TextID.' AND `Language` <> 0');
+    $System->Database->query('DELETE FROM `'.$Table.'` WHERE `ID` = '.$TextID.' AND `Language` <> 0');
     echo('Překlad byl smazán!');   
     WriteLog('Překlad byl smazán! <a href="form.php?group='.$GroupID.'&amp;ID='.$TextID.'">'.$TextID.'</a>', LOG_TYPE_MODERATOR);
@@ -184 +192 @@
 function ShoutBox()
 {
-  global $Database, $User;
-  
-  if(array_key_exists('shoutbox', $_GET)) $shoutbox = $_GET['shoutbox'];
-  else $shoutbox = '';
-  if($shoutbox == '') 
-  {
-    echo('<form action="action.php?action=shoutbox&amp;shoutbox=1" method="post"><fieldset><legend>Nová zpráva kecátka</legend>
-      Uživatel: ');
+  global $System, $User;
+  
+  if(!array_key_exists('add', $_POST)) 
+  {
+    echo('<form action="action.php?action=shoutbox" method="post">'.
+    '<fieldset><legend>Nová zpráva kecátka</legend>
+     Uživatel: ');
     if($User->Licence(LICENCE_USER)) echo('<b>'.$User->Name.'</b><br />'); 
-  else echo('<input type="text" name="user" /><br />');
+    else echo('<input type="text" name="user" /><br />');
     echo('Text zprávy: <br>
       <textarea  onkeydown="ResizeTextArea(this)" name="text" cols="40"></textarea> <br />
-      <input type="submit" value="Odeslat" /><br /></fieldset>
+      <input type="submit" name="add" value="Odeslat" /><br /></fieldset>
       </form>');
   } else 
@@ -202 +209 @@
     if($User->Licence(LICENCE_USER))
     {
-      $Text = $_POST['text'];
-      $Database->SQLCommand('INSERT INTO `ShoutBox` ( `User` , `Text` , `Date` , `IP` ) '.
+      if(array_key_exists('text', $_POST)) 
+      {
+        $Text = $_POST['text'];
+        $System->Database->query('INSERT INTO `ShoutBox` ( `User` , `Text` , `Date` , `IP` ) '.
       ' VALUES ("'.$User->Name.'", "'.$Text.'", NOW(), "'.$_SERVER['REMOTE_ADDR'].'")');
-      echo('Zpráva vložena!<br>Budete přesměrováni...');   
-      echo('
-        <script type="text/javascript" language="JavaScript" charset="utf-8">
-            setTimeout("parent.location.href=\'index.php\'",1000)
-        </script>');
-    } else echo('Pro vkládaní musíte byt registrováni!');
-  }
+        echo('Zpráva vložena!<br/>');   
+      } else echo('Nezadán text pro novou zprávu!<br/>');   
+    } else echo('Pro vkládaní musíte byt registrováni!<br/>');
+  }
+  echo('<br/>');
+  ShoutBoxView();
 }
 
 function ShoutBoxView()
 {
-  global $Database, $User;
-  
-  $DbResult = $Database->SQLCommand('SELECT COUNT(*) FROM `ShoutBox`');
-  $DbRow = mysql_fetch_row($DbResult);
+  global $System, $User;
+  
+  $DbResult = $System->Database->query('SELECT COUNT(*) FROM `ShoutBox`');
+  $DbRow = $DbResult->fetch_row();
   $PageList = GetPageList($DbRow[0]);    
 
@@ -226 +234 @@
   if($User->Licence(LICENCE_USER)) echo(' <a href="action.php?action=shoutbox">Vložit</a>');
   echo('<div class="shoutbox">');
-  $ID = $Database->SQLCommand('SELECT * FROM `ShoutBox` ORDER BY `ID` DESC '.$PageList['SQLLimit']);
-  while($Line = mysql_fetch_assoc($ID))
+  $DbResult = $System->Database->query('SELECT * FROM `ShoutBox` ORDER BY `ID` DESC '.$PageList['SQLLimit']);
+  while($Line = $DbResult->fetch_assoc())
     echo('<div><strong>'.$Line['User'].'</strong>: '.htmlspecialchars($Line['Text']).'</div>');
   echo('</div>');
@@ -235 +243 @@
 function ShowNewsHistory()
 {
-  global $Database, $User;
-  
-  $DbResult = $Database->SQLCommand('SELECT COUNT(*) FROM `News`');
-  $DbRow = mysql_fetch_row($DbResult);
+  global $System, $User;
+  
+  $DbResult = $System->Database->query('SELECT COUNT(*) FROM `News`');
+  $DbRow = $DbResult->fetch_row();
   $PageList = GetPageList($DbRow[0]);    
 
@@ -245 +253 @@
   if($User->Licence(LICENCE_USER)) echo(' <a href="admin.php?action=addnew">Vložit</a>');
   echo('<div class="shoutbox">');
-  $ID = $Database->SQLCommand('SELECT `News`.`Time`, `News`.`Text`, `User`.`Name` AS `User` FROM `News` JOIN `User` ON `User`.`ID`=`News`.`User` ORDER BY `News`.`Time` DESC '.$PageList['SQLLimit']);
-  while($Line = mysql_fetch_assoc($ID))
+  $dbResult = $System->Database->query('SELECT `News`.`Time`, `News`.`Text`, `User`.`Name` AS `User` FROM `News` JOIN `User` ON `User`.`ID`=`News`.`User` ORDER BY `News`.`Time` DESC '.$PageList['SQLLimit']);
+  while($Line = $DbResult->fetch_assoc())
     echo('<div><strong>'.HumanDate($Line['Time']).'</strong> '.$Line['Text'].' ('.$Line['User'].')</div>');
   echo('</div>');

trunk/admin.php

@@ -41 +41 @@
 function SaveNew()
 {
-  global $Database, $Config, $User;
+  global $System, $Config, $User;
   
   if(array_key_exists('text', $_POST)) 
   {
     $querty = 'INSERT INTO `News` ( `Time` ,`User` ,`Text`) VALUES ( NOW( ) , '.$User->Id.', "'.$_POST['text'].'")';
-    $Database->SQLCommand($querty);
+    $System->Database->query($querty);
     echo('Aktualita uložena!');
     WriteLog('Vložena nová aktualita', LOG_TYPE_ADMINISTRATION);
@@ -54 +54 @@
 function DeleteOldUsers()
 {
-  global $Database;
+  global $System;
   
-  $DbResult = $Database->SQLCommand('SELECT COUNT(*) FROM `User`');
-  $DbRow2 = mysql_fetch_row($DbResult);
+  $DbResult = $System->Database->query('SELECT COUNT(*) FROM `User`');
+  $DbRow2 = $DbResult->fetch_row();
 
   $Condition = ' WHERE (`TranslatedCount`= 0)'. // Without translated texts
@@ -67 +67 @@
     ' AND (NOT EXISTS (SELECT `ID` FROM `ShoutBox` WHERE `User`.`Name` = `ShoutBox`.`User`))'. // Without shoutbox messages
     '';
-  $DbResult = $Database->SQLCommand('SELECT COUNT(*) FROM `User`'.$Condition);
-  $DbRow = mysql_fetch_row($DbResult);
-  $Database->SQLCommand('DELETE FROM `User`'.$Condition);
+  $DbResult = $System->Database->query('SELECT COUNT(*) FROM `User`'.$Condition);
+  $DbRow = $DbResult->fetch_row();
+  $System->Database->query('DELETE FROM `User`'.$Condition);
   echo('Smazáno '.$DbRow[0].' účtů ze všech '.$DbRow2[0].'<br/>');
 
   // Delete logs without user
-  $DbResult = $Database->SQLCommand('SELECT COUNT(*) FROM `Log`');
-  $DbRow2 = mysql_fetch_row($DbResult);
-  $DbResult = $Database->SQLCommand('SELECT COUNT(*) FROM `Log` WHERE (NOT EXISTS (SELECT `ID` FROM `User` WHERE `User`.`ID` = `Log`.`User`)) AND (`User` != 0)');
-  $DbRow = mysql_fetch_row($DbResult);
-  $Database->SQLCommand('DELETE FROM `Log` WHERE (NOT EXISTS (SELECT `ID` FROM `User` WHERE `User`.`ID` = `Log`.`User`)) AND (`User` != 0)');
+  $DbResult = $System->Database->query('SELECT COUNT(*) FROM `Log`');
+  $DbRow2 = $DbResult->fetch_row();
+  $DbResult = $System->Database->query('SELECT COUNT(*) FROM `Log` WHERE (NOT EXISTS (SELECT `ID` FROM `User` WHERE `User`.`ID` = `Log`.`User`)) AND (`User` != 0)');
+  $DbRow = $DbResult->fetch_row();
+  $System->Database->query('DELETE FROM `Log` WHERE (NOT EXISTS (SELECT `ID` FROM `User` WHERE `User`.`ID` = `Log`.`User`)) AND (`User` != 0)');
   echo('Smazáno '.$DbRow[0].' položek logu ze všech '.$DbRow2[0].'<br/>');     
       
   // Delete invalid ExportUser
-  $DbResult = $Database->SQLCommand('SELECT COUNT(*) FROM `ExportUser`');
-  $DbRow2 = mysql_fetch_row($DbResult);
-  $DbResult = $Database->SQLCommand('SELECT COUNT(*) FROM `ExportUser` WHERE (NOT EXISTS (SELECT `Id` FROM `User` WHERE `User`.`ID` = `ExportUser`.`User`))');
-  $DbRow = mysql_fetch_row($DbResult);
-  $Database->SQLCommand('DELETE FROM `ExportUser` WHERE (NOT EXISTS (SELECT `Id` FROM `User` WHERE `User`.`ID` = `ExportUser`.`User`))');
+  $DbResult = $System->Database->query('SELECT COUNT(*) FROM `ExportUser`');
+  $DbRow2 = $DbResult->fetch_row();
+  $DbResult = $System->Database->query('SELECT COUNT(*) FROM `ExportUser` WHERE (NOT EXISTS (SELECT `Id` FROM `User` WHERE `User`.`ID` = `ExportUser`.`User`))');
+  $DbRow = $DbResult->fetch_row();
+  $System->Database->query('DELETE FROM `ExportUser` WHERE (NOT EXISTS (SELECT `Id` FROM `User` WHERE `User`.`ID` = `ExportUser`.`User`))');
   echo('Smazáno '.$DbRow[0].' položek výběru překladatelů u exportů ze všech '.$DbRow2[0].'<br/>');     
 
   // Delete all teams without users
-  $DbResult = $Database->SQLCommand('SELECT COUNT(*) FROM `Team`');
-  $DbRow2 = mysql_fetch_row($DbResult);
-  $DbResult = $Database->SQLCommand('SELECT COUNT(*) FROM `Team` WHERE (SELECT COUNT(*) FROM `User` WHERE `User`.`Team` = `Team`.`Id`) = 0');
-  $DbRow = mysql_fetch_row($DbResult);
-  $Database->SQLCommand('DELETE FROM `Team` WHERE (SELECT COUNT(*) FROM `User` WHERE `User`.`team` = `Team`.`Id`) = 0');
+  $DbResult = $System->Database->query('SELECT COUNT(*) FROM `Team`');
+  $DbRow2 = $DbResult->fetch_row();
+  $DbResult = $System->Database->query('SELECT COUNT(*) FROM `Team` WHERE (SELECT COUNT(*) FROM `User` WHERE `User`.`Team` = `Team`.`Id`) = 0');
+  $DbRow = $DbResult->fetch_row();
+  $System->Database->query('DELETE FROM `Team` WHERE (SELECT COUNT(*) FROM `User` WHERE `User`.`team` = `Team`.`Id`) = 0');
   echo('Smazáno '.$DbRow[0].' týmů ze všech '.$DbRow2[0].'<br/>');     
         
   // Set new leader for teams where old leader went to other team
-  $Database->SQLCommand('UPDATE `Team` SET `Leader`=(SELECT `Id` FROM `User` WHERE `User`.`Team`=`Team`.`Id` ORDER BY `User`.`RegistrationTime` LIMIT 1) WHERE `Leader` NOT IN (SELECT `ID` FROM `User` WHERE `User`.`Team`=`Team`.`Id`);');
+  $System->Database->query('UPDATE `Team` SET `Leader`=(SELECT `Id` FROM `User` WHERE `User`.`Team`=`Team`.`Id` ORDER BY `User`.`RegistrationTime` LIMIT 1) WHERE `Leader` NOT IN (SELECT `ID` FROM `User` WHERE `User`.`Team`=`Team`.`Id`);');
   
   WriteLog('Smazány staré uživatelské účty', LOG_TYPE_ADMINISTRATION);
@@ -104 +104 @@
 function DeleteErrorLog()
 {
-  global $Database;
+  global $System;
   
-  $DbResult = $Database->SQLCommand('SELECT COUNT(*) FROM `Log` WHERE `Type`='.LOG_TYPE_ERROR);
-  $DbRow = mysql_fetch_row($DbResult);
-  $Database->SQLCommand('DELETE FROM `Log` WHERE `Type`='.LOG_TYPE_ERROR);
+  $DbResult = $System->Database->query('SELECT COUNT(*) FROM `Log` WHERE `Type`='.LOG_TYPE_ERROR);
+  $DbRow = $DbResult->fetch_row();
+  $System->Database->query('DELETE FROM `Log` WHERE `Type`='.LOG_TYPE_ERROR);
   WriteLog('Vymazány chybové záznamy', LOG_TYPE_ADMINISTRATION);  
   echo('Smazáno všech '.$DbRow[0].' chybových záznamů.<br/>');     

trunk/banners.php

@@ -18 +18 @@
 echo($BannerSmall.' &nbsp;&nbsp;<textarea rows="2" cols="30">'.htmlspecialchars($BannerSmall).'</textarea><br />');
   
-$ID = $Database->SQLCommand('SELECT * FROM `Banner` WHERE `Show`=1 AND `DateLast` > (NOW() - INTERVAL 3 MONTH)');
+$DbResult = $System->Database->query('SELECT * FROM `Banner` WHERE `Show`=1 AND `DateLast` > (NOW() - INTERVAL 3 MONTH)');
   
 echo('<br/><strong>Servery odkazující na nás:</strong> <br />
 <div style="font-size: 10px;">Seznam je automaticky aktualizován a zobrazeny jsou servery s aktivní bannerem mladším než tři měsíce.</div><br />');
-while($Line = mysql_fetch_assoc($ID)) 
+while($Line = $DbResult->fetch_assoc()) 
 {
   echo('<a href="'.$Line['LastURL'].'">'.$Line['Web'].'</a> '.$Line['Description'].' <br />');    

trunk/comparison.php

@@ -55 +55 @@
   } else $WhereID = '';
 
-  $DataID = $Database->SQLCommand('SELECT * FROM '.$Table.' Where entry = '.$Textentry.' '.$WhereID.' ORDER BY Language');
+  $DataID = $System->Database->query('SELECT * FROM '.$Table.' Where entry = '.$Textentry.' '.$WhereID.' ORDER BY Language');
   $i = 0;
-  while($Line = mysql_fetch_assoc($DataID))
+  while($Line = $DataID->fetch_assoc())
   {
     $BuffLine[$i] = $Line;
@@ -72 +72 @@
   foreach($Line as $Index => $LineItem)
   {
-    $LineUser = mysql_fetch_array($Database->SQLCommand('SELECT * FROM `User` WHERE `ID` = '.$LineItem['User']));
+    $DbResult = $System->Database->query('SELECT * FROM `User` WHERE `ID` = '.$LineItem['User']);
+    $LineUser = $DbResult->fetch_array();
     echo('<th>'.$LineUser['Name'].'</th>');
   }

trunk/dictionary.php

@@ -5 +5 @@
 function WriteTranslatNames($Text,$mode) 
 {
-        
+  
   if ($mode == 0) echo ('..Nalezené názvy jmen věcí, míst, postav');
   if ($mode == 1) echo ('..Všechny přeložené');
@@ -26 +26 @@
   $buff = GetTranslatNames($Text,$mode,$TablesColumn);
   
-         // $buff[] = array($Line['ID'],GetIDbyName($Table),$Line[$Column],$Line['Tran']);
+   // $buff[] = array($Line['ID'],GetIDbyName($Table),$Line[$Column],$Line['Tran']);
   foreach($buff as $Line) {
       if ($mode == 0) 
@@ -73 +73 @@
   '<a href="?mode=0&amp;group='.$GroupId.'&amp;ID='.$TextID.'" title="Zobrazit pouze přesné výsledky">Přesné</a> '.
   '<a href="?mode=2&amp;group='.$GroupId.'&amp;ID='.$TextID.'" title="Zobrazit všechny nepřeložené">Nepřeložené</a> ');
-    $Line = mysql_fetch_assoc($Database->SQLCommand('SELECT * FROM '.$Table.' Where ID = '.$TextID));
+    $DbResult = $System->Database->query('SELECT * FROM '.$Table.' Where ID = '.$TextID);
+    $Line = $DbResult->fetch_assoc();
     if(!$Line) die('Překlad nenalezen.');
     
@@ -102 +103 @@
       if(array_key_exists('Original', $_POST) and array_key_exists('Translated', $_POST) and array_key_exists('Description', $_POST))
       {       
-        $DbResult = $Database->SQLCommand('SELECT * FROM `Dictionary` WHERE `Text` = "'.$_POST['Original'].'" AND `Language`=0');
-        if(mysql_num_rows($DbResult) > 0)
-        {
-          $DbRow = mysql_fetch_assoc($DbResult);
+        $DbResult = $System->Database->query('SELECT * FROM `Dictionary` WHERE `Text` = "'.$_POST['Original'].'" AND `Language`=0');
+        if($DbResult->num_rows > 0)
+        {
+          $DbRow = $DbResult->fetch_assoc();
           $Entry = $DbRow['Entry'];
         } else 
         {
-          $DbResult = $Database->SQLCommand('SELECT MAX(`Entry`) FROM `Dictionary`');
-          $DbRow = mysql_fetch_row($DbResult);
+          $DbResult = $System->Database->query('SELECT MAX(`Entry`) FROM `Dictionary`');
+          $DbRow = $DbResult->fetch_row();
           $Entry = $DbRow[0] + 1;
-          $Database->SQLCommand('INSERT INTO `Dictionary` ( `Text` , `Entry` , `Description` , `User`, `Language` ) VALUES ("'.$_POST['Original'].'", "'.$Entry.'", "", 0, 0);');
+          $System->Database->query('INSERT INTO `Dictionary` ( `Text` , `Entry` , `Description` , `User`, `Language` ) VALUES ("'.$_POST['Original'].'", "'.$Entry.'", "", 0, 0);');
         }
       
-        $DbResult = $Database->SQLCommand('SELECT `Id` FROM `Dictionary` WHERE `Entry` = '.$Entry.' AND `Language`='.$_SESSION['language'].' AND `User`='.$User->Id);
+        $DbResult = $System->Database->query('SELECT `Id` FROM `Dictionary` WHERE `Entry` = '.$Entry.' AND `Language`='.$_SESSION['language'].' AND `User`='.$User->Id);
         if(mysql_num_rows($DbResult) > 0)
         {
           $DbRow = mysql_fetch_assoc($DbResult);
-          $Database->SQLCommand('UPDATE `Dictionary` SET `Text`="'.$_POST['Translated'].'", `Description` = "'.$_POST['Description'].'" WHERE Id='.$DbRow['Id']);
+          $System->Database->query('UPDATE `Dictionary` SET `Text`="'.$_POST['Translated'].'", `Description` = "'.$_POST['Description'].'" WHERE Id='.$DbRow['Id']);
         } else      
-          $Database->SQLCommand('INSERT INTO `Dictionary` ( `Text` , `Entry` , `Description` , `User`, `Language` ) VALUES ("'.$_POST['Translated'].'", "'.$Entry.'", "'.$_POST['Description'].'", '.$User->Id.', '.$_SESSION['language'].')');
+          $System->Database->query('INSERT INTO `Dictionary` ( `Text` , `Entry` , `Description` , `User`, `Language` ) VALUES ("'.$_POST['Translated'].'", "'.$Entry.'", "'.$_POST['Description'].'", '.$User->Id.', '.$_SESSION['language'].')');
         echo('Záznam byl uložen!');
       } else echo('Nebyly zaslány všechny položky formuláře.');
@@ -127 +128 @@
     if(($_GET['action'] == 'remove') and $User->Licence(LICENCE_USER))
     {
-      $Database->SQLCommand('DELETE FROM `Dictionary` WHERE `User`='.$User->Id.' AND `Language`='.$_SESSION['language'].' AND `Entry`='.$_GET['entry']);
+      $System->Database->query('DELETE FROM `Dictionary` WHERE `User`='.$User->Id.' AND `Language`='.$_SESSION['language'].' AND `Entry`='.$_GET['entry']);
     } else
     if(($_GET['action'] == 'modify')  and $User->Licence(LICENCE_USER))
     {
-      $DbResult = $Database->SQLCommand('SELECT * FROM `Dictionary` WHERE `User`='.$User->Id.' AND `Entry`='.$_GET['entry'].' AND `Language`='.$_SESSION['language']);
-      $DbRow = mysql_fetch_assoc($DbResult);
-      $DbResult = $Database->SQLCommand('SELECT * FROM `Dictionary` WHERE `User`=0 AND `Entry`='.$_GET['entry'].' AND `Language`=0');
-      $DbRow2 = mysql_fetch_assoc($DbResult);
+      $DbResult = $System->Database->query('SELECT * FROM `Dictionary` WHERE `User`='.$User->Id.' AND `Entry`='.$_GET['entry'].' AND `Language`='.$_SESSION['language']);
+      $DbRow = $DbResult->fetch_assoc();
+      $DbResult = $System->Database->query('SELECT * FROM `Dictionary` WHERE `User`=0 AND `Entry`='.$_GET['entry'].' AND `Language`=0');
+      $DbRow2 = $DbResult->fetch_assoc();
       echo('<form action="dictionary.php?action=save" method="post">'.
       '<fieldset><legend>Upravení slova</legend>'.
@@ -177 +178 @@
   } else $sql = 'SELECT `User`.`Name` AS `UserName`, `ID` AS `UserID`, `T3`.`Entry`, `T3`.`Original`, `T3`.`Translated`, `T3`.`Description` FROM (SELECT `T2`.`User`, `T1`.Language, `T1`.`Text` AS `Original`, `T2`.`Text` AS `Translated`, `T2`.`Description`, `T1`.`Entry` AS `Entry` FROM `Dictionary` AS `T1` JOIN `Dictionary` AS `T2` ON `T2`.`Entry` = `T1`.`Entry` AND `T2`.`Language` = '.$_SESSION['language'].') AS `T3` JOIN `User` ON `User`.`ID` = `T3`.`User` WHERE `T3`.`Language` = 0';
 
-  $DbResult = $Database->SQLCommand('SELECT COUNT(*) FROM ('.$sql.') AS `T1`');
-  $DbRow = mysql_fetch_row($DbResult);
+  $DbResult = $System->Database->query('SELECT COUNT(*) FROM ('.$sql.') AS `T1`');
+  $DbRow = $DbResult->fetch_row();
   $PageList = GetPageList($DbRow[0]);  
 
@@ -195 +196 @@
 
   $sql_page = $sql.$Order['SQL'].$PageList['SQLLimit'];
-  $ID = $Database->SQLCommand($sql_page);
-  while($Line = mysql_fetch_assoc($ID)) 
+  $DbResult = $System->Database->query($sql_page);
+  while($Line = $DbResult->fetch_assoc()) 
   {
     echo('<tr>

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");
     }

trunk/form.php

@@ -30 +30 @@
   $TextID = $_GET['ID'] * 1;  
 
-  $DbResult = $Database->SQLCommand('SELECT * FROM `'.$Table.'` WHERE `ID` = '.$TextID);
-  $Line = mysql_fetch_assoc($DbResult);
+  $DbResult = $System->Database->query('SELECT * FROM `'.$Table.'` WHERE `ID` = '.$TextID);
+  $Line = $DbResult->fetch_assoc();
   if(!$Line) ErrorMessage('Překlad nenalezen.');
     
-  $DbResult = $Database->SQLCommand('SELECT * FROM `'.$Table.'` WHERE (`Language` = 0) AND (`Entry` = '.$Line['Entry'].') AND (`VersionEnd` = '.$Line['VersionEnd'].') LIMIT 1');
-  $LineAJ = mysql_fetch_assoc($DbResult);
+  $DbResult = $System->Database->query('SELECT * FROM `'.$Table.'` WHERE (`Language` = 0) AND (`Entry` = '.$Line['Entry'].') AND (`VersionEnd` = '.$Line['VersionEnd'].') LIMIT 1');
+  $LineAJ = $DbResult->fetch_assoc();
   if(!$Line) ErrorMessage('Anglický originál k překladu nenalezen.');
   
-  $IDUser = $Database->SQLCommand('SELECT * FROM `User` WHERE `ID` = '.$Line['User']);
-  $LineUser = mysql_fetch_array($IDUser);
+  $IDUser = $System->Database->query('SELECT * FROM `User` WHERE `ID` = '.$Line['User']);
+  $LineUser = $IDUser->fetch_array();
   
   echo('Skupina: <strong>'.$TranslationTree[$GroupId]['Name'].'</strong><br />');
@@ -47 +47 @@
   if(($Line['Take'] <> 0) and ($Line['Take'] <> $Line['ID'])) 
   {
-    $Language = mysql_fetch_assoc($Database->SQLCommand('SELECT `Language`,`VersionStart`,`VersionEnd` FROM `'.$Table.'` WHERE `ID` = '.$Line['Take']));
+    $DbResult = $System->Database->query('SELECT `Language`,`VersionStart`,`VersionEnd` FROM `'.$Table.'` WHERE `ID` = '.$Line['Take']);
+    $Language = $DbResult->fetch_assoc();
     // echo $Language['Language'].'  '.$Line['Take'];
     if($Language['Language'] <> 0)
@@ -63 +64 @@
   echo('<br />');
    
-  $DbResult = $Database->SQLCommand('SELECT COUNT(*) FROM `'.$Table.'` WHERE (`Entry` = '.$Line['Entry'].') AND (`Language` <> 0) AND (`Complete` = 1)');
-  $Version = mysql_fetch_row($DbResult);
+  $DbResult = $System->Database->query('SELECT COUNT(*) FROM `'.$Table.'` WHERE (`Entry` = '.$Line['Entry'].') AND (`Language` <> 0) AND (`Complete` = 1)');
+  $Version = $DbResult->fetch_row();
   $Version = $Version[0];
   if($Version > 0)
@@ -75 +76 @@
       <option value="-1">Vyberte text k porovnání</option>
       <option value="-1">Zobrazit/porovnat všechny</option>'); 
-    $DataID = $Database->SQLCommand('SELECT *, (SELECT `User`.`Name` AS `UserName` FROM `User` WHERE `User`.`ID` = `'.$Table.'`.`User`) AS `UserName` FROM `'.$Table.'` WHERE (`Entry` = '.$Line['Entry'].') AND (`ID` <> '.$Line['ID'].') AND (`Complete` = 1)');  
-    while($version = mysql_fetch_array($DataID))
+    $DataID = $System->Database->query('SELECT *, (SELECT `User`.`Name` AS `UserName` FROM `User` WHERE `User`.`ID` = `'.$Table.'`.`User`) AS `UserName` FROM `'.$Table.'` WHERE (`Entry` = '.$Line['Entry'].') AND (`ID` <> '.$Line['ID'].') AND (`Complete` = 1)');  
+    while($version = $DataID->fetch_array())
     {     
       if ($version['ID'] == $Line['Take']) echo('<option value="'.$version['ID'].'">'.$version['ID'].' - '.$version['User'].' (převzato)</option>');   

trunk/img_level.php

@@ -57 +57 @@
 function GetXPFromTranslation($UserId) 
 {
-  global $Database, $TranslationTree, $xp_from_word, $from_diakrit;
+  global $System, $TranslationTree, $xp_from_word, $from_diakrit;
   
   $xp = 0;
@@ -71 +71 @@
       $GroupBy = substr($GroupBy, 0, -2);
       
-      $IDtran = $Database->SQLCommand('SELECT * FROM `'.$Group['TablePrefix'].'` WHERE (`User` = '.$UserId.') AND (`Complete` = 1) '.$GroupBy);
-      while($Line = mysql_fetch_array($IDtran)) 
+      $IDtran = $System->Database->query('SELECT * FROM `'.$Group['TablePrefix'].'` WHERE (`User` = '.$UserId.') AND (`Complete` = 1) '.$GroupBy);
+      while($Line = $IDtran->fetch_array()) 
       {   
-        $DbResult = $Database->SQLCommand('SELECT * FROM `'.$Group['TablePrefix'].'` WHERE `ID` = '.$Line['Take']);
-        $LineComparison = mysql_fetch_assoc($DbResult);
+        $DbResult = $System->Database->query('SELECT * FROM `'.$Group['TablePrefix'].'` WHERE `ID` = '.$Line['Take']);
+        $LineComparison = $DbResult->fetch_assoc();
         $xp_translation = 0;   
         $translated = true;
@@ -103 +103 @@
 function ImgLevelUpdate()
 { 
-  global $Database, $TranslationTree;
+  global $System, $TranslationTree;
 
   // Hlavní kod pro uživatele
-  $ID = $Database->SQLCommand('SELECT `ID`, `Name` FROM `User` WHERE `NeedUpdate` = 1');
-  while($LineUser = mysql_fetch_array($ID)) 
+  $DbResult = $System->Database->query('SELECT `ID`, `Name` FROM `User` WHERE `NeedUpdate` = 1');
+  while($LineUser = $DbResult->fetch_array()) 
   {
     // Build TranslatedCount query
@@ -120 +120 @@
     
     $xp = GetXPFromTranslation($LineUser['ID']); 
-    $Database->SQLCommand('UPDATE `User` SET `XP` = '.$xp.', `TranslatedCount` = '.$TranslatedCount.' WHERE `User`.`ID` = '.$LineUser['ID']);
+    $System->Database->query('UPDATE `User` SET `XP` = '.$xp.', `TranslatedCount` = '.$TranslatedCount.' WHERE `User`.`ID` = '.$LineUser['ID']);
     CreateImg('user', $LineUser['Name'], $xp);
   }
 
   // Hlavní kod pro překladatelské týmy
-  $ID = $Database->SQLCommand('SELECT `ID`, `Name`, (SELECT AVG(`XP`) FROM `User` WHERE `Team` = `Team`.`Id`) AS `Average` FROM `Team` WHERE `ID` IN (SELECT `Team` FROM `User` WHERE `NeedUpdate` = 1)');
-  while($LineTeam = mysql_fetch_array($ID)) 
+  $DbResult = $System->Database->query('SELECT `ID`, `Name`, (SELECT AVG(`XP`) FROM `User` WHERE `Team` = `Team`.`Id`) AS `Average` FROM `Team` WHERE `ID` IN (SELECT `Team` FROM `User` WHERE `NeedUpdate` = 1)');
+  while($LineTeam = $DbResult->fetch_array()) 
   {
     CreateImg('team', $LineTeam['Name'], substr($LineTeam['Average'], 0, strpos($LineTeam['Average'],'.')));  //vytváření obrázku
   }
-  $Database->SQLCommand('UPDATE `User` SET `NeedUpdate` = 0');
+  $System->Database->query('UPDATE `User` SET `NeedUpdate` = 0');
 }
 
 function ImgLevelShow()
 {
-  global $Database;
+  global $System;
   
   // Do update for all users
-  $Database->SQLCommand('UPDATE `User` SET `NeedUpdate` = 1');
+  $System->Database->query('UPDATE `User` SET `NeedUpdate` = 1');
   ImgLevelUpdate();
   
   echo('<strong>Uživatelé</strong><br/>');
-  $ID = $Database->SQLCommand('SELECT `ID`, `Name` FROM `User`');
-  while($LineUser = mysql_fetch_array($ID)) 
+  $ID = $System->Database->query('SELECT `ID`, `Name` FROM `User`');
+  while($LineUser = $ID->fetch_array()) 
   {
     echo('<img src="tmp/user/'.$LineUser['Name'].'/level.png" /> '.$LineUser['Name'].'<br />');
@@ -149 +149 @@
 
   echo('<br/><strong>Týmy</strong><br/>');
-  $ID = $Database->SQLCommand('SELECT `ID`, `Name` FROM `Team`');
-  while($LineTeam = mysql_fetch_array($ID)) 
+  $ID = $System->Database->query('SELECT `ID`, `Name` FROM `Team`');
+  while($LineTeam = $ID->fetch_array()) 
   {
     echo('<img src="tmp/team/'.$LineTeam['Name'].'/level.png" /> '.$LineTeam['Name'].'<br />');

trunk/img_statistic.php

@@ -19 +19 @@
 
 
-$DbResult = $Database->SQLCommand('SELECT MAX(`VersionEnd`) FROM '.$Group['TablePrefix']);
-$ID = mysql_fetch_row($DbResult);
+$DbResult = $System->Database->query('SELECT MAX(`VersionEnd`) FROM '.$Group['TablePrefix']);
+$ID = $DbResult->fetch_row();
 $BuildNumber_max = $ID[0];
 if($BuildNumber_max == '') $BuildNumber_max = 0; // Empty result, no items in this group
 
 $where = '(`VersionEnd` = '.$BuildNumber_max.') AND (`Language` <> 0) AND (`Complete` = 1) '.$team.$language;
-$ID = mysql_fetch_row($Database->SQLCommand('SELECT COUNT(DISTINCT(`Entry`)) FROM `'.$Group['TablePrefix'].'` WHERE '.$where));
+$DbResult = $System->Database->query('SELECT COUNT(DISTINCT(`Entry`)) FROM `'.$Group['TablePrefix'].'` WHERE '.$where);
+$ID = $DbResult->fetch_row();
 $NumberTranslate = $ID[0];
   
-$DbResult = $Database->SQLCommand('SELECT COUNT(DISTINCT(`Entry`)) FROM `'.$Group['TablePrefix'].'` WHERE (`VersionEnd` = '.$BuildNumber_max.') AND (`Language` = 0)');
-$ID = mysql_fetch_row($DbResult);
+$DbResult = $System->Database->query('SELECT COUNT(DISTINCT(`Entry`)) FROM `'.$Group['TablePrefix'].'` WHERE (`VersionEnd` = '.$BuildNumber_max.') AND (`Language` = 0)');
+$ID = $DbResult->fetch_row();
 $NumberAJ = $ID[0];
 

trunk/import/import.php

@@ -6 +6 @@
   var $Group;
   var $NewItemCount;
+  var $System;
+  
+  function __construct($System)
+  {
+    $this->System = &$System;
+  }
   
   function SetVersion($Version)
@@ -16 +22 @@
   
   function InsertItem($Value)
-  {
-    global $Database;
-  
+  {   
     $Columns = '';
     foreach($this->Group['Items'] as $GroupItem)
@@ -28 +32 @@
     //print_r($Value);
   
-    $DbResult2 = $Database->SQLCommand('SELECT `VersionEnd`, `ID`, `Entry`, '.$Columns.' FROM `'.$this->Group['TablePrefix'].'` WHERE '.$Where.' AND (`Language`=0) ORDER BY `VersionStart` DESC LIMIT 1');
+    $DbResult2 = $this->System->Database->query('SELECT `VersionEnd`, `ID`, `Entry`, '.$Columns.' FROM `'.$this->Group['TablePrefix'].'` WHERE '.$Where.' AND (`Language`=0) ORDER BY `VersionStart` DESC LIMIT 1');
     //echo('SELECT `VersionEnd`, `ID`, `Entry`, '.$Columns.' FROM `'.$this->Group['TablePrefix'].'` WHERE '.$Where.' AND (`Language`=0) ORDER BY `VersionStart` DESC LIMIT 1');
-    if(isset($DbResult2) and (mysql_num_rows($DbResult2) > 0))
+    if(isset($DbResult2) and ($DbResult2->num_rows > 0))
     {
       // Update existed text
-      $DbRow2 = mysql_fetch_assoc($DbResult2);
+      $DbRow2 = $DbResult2->fetch_assoc();
       if($this->HaveSameText($this->Group, $DbRow2, $Value)) 
       {
         if($DbRow2['VersionEnd'] <> $this->Version['BuildNumber']) 
         {
-          $Database->SQLCommand('UPDATE `'.$this->Group['TablePrefix'].'` SET `VersionEnd` = "'.$this->Version['BuildNumber'].'" WHERE `ID`='.$DbRow2['ID']);
+          $this->System->Database->query('UPDATE `'.$this->Group['TablePrefix'].'` SET `VersionEnd` = "'.$this->Version['BuildNumber'].'" WHERE `ID`='.$DbRow2['ID']);
           echo(', '); 
         } else echo('. '); 
@@ -50 +54 @@
           $Values .= ', "'.$Value[$GroupItem['Column']].'"';
         }
-        $Database->SQLCommand('INSERT `'.$this->Group['TablePrefix'].'` ('.$Columns.') VALUES ('.$Values.')');
+        $this->System->Database->query('INSERT `'.$this->Group['TablePrefix'].'` ('.$Columns.') VALUES ('.$Values.')');
         echo('# ');
-        WriteLog('Text <a href="form.php?group='.$this->Group['Id'].'&amp;ID='.mysql_insert_id().'">'.mysql_insert_id().'</a> ('.$DbRow2['Entry'].') ze skupiny '.$this->Group['Name'].' byl v nové verzi '.$this->Version['Version'].' změněn.', LOG_TYPE_IMPORT);
+        $InsertId = $this->System->Database->insert_id;
+        WriteLog('Text <a href="form.php?group='.$this->Group['Id'].'&amp;ID='.$InsertId.'">'.$InsertId.'</a> ('.$DbRow2['Entry'].') ze skupiny '.$this->Group['Name'].' byl v nové verzi '.$this->Version['Version'].' změněn.', LOG_TYPE_IMPORT);
       }       
     } else 
@@ -62 +67 @@
         // Get new unused Entry for tables without numeric id
         $Value['Entry'] = 1;
-        $DbResult = $Database->SQLCommand('SELECT MAX(`Entry`) FROM `'.$this->Group['TablePrefix'].'`');
-        if(mysql_num_rows($DbResult) > 0)
-        {
-          $DbRow = mysql_fetch_row($DbResult);
+        $DbResult = $this->System->Database->query('SELECT MAX(`Entry`) FROM `'.$this->Group['TablePrefix'].'`');
+        if($DbResult->num_rows > 0)
+        {
+          $DbRow = $DbResult->fetch_row();
           $Value['Entry'] += $DbRow[0];
         }           
@@ -76 +81 @@
         $Values .= ', "'.$Value[$GroupItem['Column']].'"';
       }
-      $Database->SQLCommand('INSERT `'.$this->Group['TablePrefix'].'` ('.$Columns.') VALUES ('.$Values.')');
+      $this->System->Database->query('INSERT `'.$this->Group['TablePrefix'].'` ('.$Columns.') VALUES ('.$Values.')');
+      $InsertId = $this->System->Database->insert_id;
       echo('+ ');
       $this->NewItemCount++;
-      WriteLog('Text <a href="form.php?group='.$this->Group['Id'].'&amp;ID='.mysql_insert_id().'">'.mysql_insert_id().'</a> ('.$Value['Entry'].') ze skupiny '.$this->Group['Name'].' byl v nové verzi '.$this->Version['Version'].' přidán.', LOG_TYPE_IMPORT);
+      WriteLog('Text <a href="form.php?group='.$this->Group['Id'].'&amp;ID='.$InsertId.'">'.$InsertId.'</a> ('.$Value['Entry'].') ze skupiny '.$this->Group['Name'].' byl v nové verzi '.$this->Version['Version'].' přidán.', LOG_TYPE_IMPORT);
     }
   }
@@ -85 +91 @@
   function ImportLUA()
   {
-    global $Database, $TranslationTree, $PatchVersion, $Config;
+    global $TranslationTree, $PatchVersion;
        
     echo('Načítání textů z LUA souboru...');
@@ -126 +132 @@
           }
           echo('<br />Celkem: '.$Count.'  Nových: '.$this->NewItemCount.'<br />');
-          $Database->SQLCommand('UPDATE `Group` SET `LastVersion` = "'.$this->Version['BuildNumber'].'", `LastImport` = NOW() WHERE `Id`='.$this->Group['Id']);
+          $this->System->Database->query('UPDATE `Group` SET `LastVersion` = "'.$this->Version['BuildNumber'].'", `LastImport` = NOW() WHERE `Id`='.$this->Group['Id']);
         } else echo('Již importován pro verzi '.$this->Version['Version']);
       } else echo('Není definováno jméno zdrojového souboru');
@@ -134 +140 @@
   function UpdateTranslated()
   {
-    global $Database, $TranslationTree, $PatchVersion, $Config;
+    global $TranslationTree, $PatchVersion, $Config;
   
     echo('<br /><br />Začínám se synchronizací VersionEnd u přeložených textů<br />');
@@ -140 +146 @@
     {
       echo('<br />'.$Group['Name'].' ');     
-      $DbResult = $Database->SQLCommand('SELECT `gs_tran`.`ID`, `gs_tran`.`VersionEnd` AS `VersionEnd_tran`, `gs_orig`.`VersionEnd` AS `VersionEnd_orig` FROM `'.$Group['TablePrefix'].'` AS `gs_tran` JOIN `'.$Group['TablePrefix'].'` AS `gs_orig` ON `gs_orig`.`ID` = `gs_tran`.`Take` WHERE `gs_tran`.`VersionEnd` <> `gs_orig`.`VersionEnd`');
-      while($DbRow = mysql_fetch_assoc($DbResult)) 
+      $DbResult = $this->System->Database->query('SELECT `gs_tran`.`ID`, `gs_tran`.`VersionEnd` AS `VersionEnd_tran`, `gs_orig`.`VersionEnd` AS `VersionEnd_orig` FROM `'.$Group['TablePrefix'].'` AS `gs_tran` JOIN `'.$Group['TablePrefix'].'` AS `gs_orig` ON `gs_orig`.`ID` = `gs_tran`.`Take` WHERE `gs_tran`.`VersionEnd` <> `gs_orig`.`VersionEnd`');
+      while($DbRow = $DbResult->fetch_assoc()) 
       { 
-        $Database->SQLCommand('UPDATE `'.$Group['TablePrefix'].'` SET `VersionEnd` = '.$DbRow['VersionEnd_orig'].' WHERE `ID` = '.$DbRow['ID']);
+        $this->System->Database->query('UPDATE `'.$Group['TablePrefix'].'` SET `VersionEnd` = '.$DbRow['VersionEnd_orig'].' WHERE `ID` = '.$DbRow['ID']);
         echo('. '); 
       }  
@@ -253 +259 @@
   function ImportSQL()
   {
-    global $Database, $TranslationTree, $PatchVersion, $Config;
+    global $TranslationTree, $PatchVersion;
   
     $File = new FileStream();
@@ -357 +363 @@
     }
     echo('<br />Celkem: '.$Count.'  Nových: '.$this->NewItemCount.'<br />');
-  $Database->SQLCommand('UPDATE `Group` SET `LastVersion` = "'.$this->Version['BuildNumber'].'", `LastImport` = NOW() WHERE `Id`='.$this->Group['Id']);
+  $this->System->Database->query('UPDATE `Group` SET `LastVersion` = "'.$this->Version['BuildNumber'].'", `LastImport` = NOW() WHERE `Id`='.$this->Group['Id']);
   }
 }

trunk/import/index.php

@@ -34 +34 @@
 function ShowImportGroup()
 {
-  global $Config;
+  global $System;
   
   if(array_key_exists('id', $_GET)) 
@@ -41 +41 @@
     
     $GroupId = (int)$_GET['id'];
-    $Import = new Import();
-    $Import->SetVersion($Config['Web']['GameVersion']);
+    $Import = new Import($System);
+    $Import->SetVersion($System->Config['Web']['GameVersion']);
     $Import->ImportGroup($GroupId);
   
@@ -52 +52 @@
 function ShowMenu()
 {
-  global $TranslationTree, $Database, $Config;
+  global $TranslationTree, $System;
   
   echo('</div><div><strong>Import zdrojů:</strong></div>');
@@ -58 +58 @@
   echo('<div><a href="?action=instructions">Instrukce pro přípravu zdrojových souborů</a></div>');
   echo('<div><a href="?action=update_translated">Zaktualizovat verze přeložených</a></div><br/>');
-  echo('Verze klienta použitá pro import: <strong>'.$Config['Web']['GameVersion'].'</strong>');
-  $DbResult = $Database->SQLCommand('SELECT COUNT(*) FROM `Group`');
-  $DbRow = mysql_fetch_row($DbResult);
+  echo('Verze klienta použitá pro import: <strong>'.$System->Config['Web']['GameVersion'].'</strong>');
+  $DbResult = $System->Database->query('SELECT COUNT(*) FROM `Group`');
+  $DbRow = $DbResult->fetch_row();
   $PageList = GetPageList($DbRow[0]);  
   echo('<h3>Seznam překladových skupin</h3>');
@@ -78 +78 @@
   echo($Order['Output']);
 
-  $ID = $Database->SQLCommand('SELECT * FROM `Group`'.$Order['SQL'].$PageList['SQLLimit']);
-  while($Group = mysql_fetch_assoc($ID)) 
+  $DbResult = $System->Database->query('SELECT * FROM `Group`'.$Order['SQL'].$PageList['SQLLimit']);
+  while($Group = $DbResult->fetch_assoc()) 
   {
     echo('<tr><td>'.$Group['Name'].'</td><td>'.$Group['SourceType'].'</td><td>');
@@ -92 +92 @@
 function UpdateTranslated()
 {
+  global $System;
+  
   echo('<div style="font-size: xx-small;">');
-  $Import = new Import();
+  $Import = new Import($System);
   $Import->UpdateTranslated();
   echo('</div>');

trunk/includes/Database.php

@@ -17 +17 @@
   function open()
   {
-    parent::__construct($this->HostName, $this->UserName, $this->Password, $this->Schema);
+    parent::real_connect($this->HostName, $this->UserName, $this->Password, $this->Schema);
     $this->charset($this->Charset);
   }

trunk/includes/global.php

@@ -15 +15 @@
 
 include_once(dirname(__FILE__).'/config.php');
-include_once(dirname(__FILE__).'/error.php');
-include_once(dirname(__FILE__).'/databaseconection.php');
+include_once(dirname(__FILE__).'/Database.php');
 include_once(dirname(__FILE__).'/global_function.php');
 include_once(dirname(__FILE__).'/rss.php');
@@ -22 +21 @@
 include_once(dirname(__FILE__).'/user.php');
 
-$Database = new Database($Config['Database']['Host'], $Config['Database']['User'], $Config['Database']['Password']); 
-$Database->SQLCommand('SET NAMES '.$Config['Database']['Charset']);
-$Database->SelectDatabase($Config['Database']['Database']);    
-
-$TranslationTree = GetTranslationTree();
-$LanguageList = GetLanguageList();
-
 $System = new System();
 $System->Init();
 $User = new User($System);
 
+include_once(dirname(__FILE__).'/error.php');
+
+$TranslationTree = GetTranslationTree();
+$LanguageList = GetLanguageList();
+
 function GetMicrotime()
 {
@@ -41 +38 @@
 function ShowShoutbox()
 {
-  global $Database, $Config, $User, $System;
+  global $System, $Config, $User, $System;
   
   echo('<strong><a href="'.$System->Link('/action.php?action=ShoutBoxView').'">Kecátko:</a></strong>');
@@ -47 +44 @@
     echo(' <a href="'.$System->Link('/action.php?action=shoutbox').'">Vložit</a>');
   echo('<div class="box"><table>');
-  $ID = $Database->SQLCommand('SELECT * FROM `ShoutBox` ORDER BY `ID` DESC LIMIT 30');
-  while($Line = mysql_fetch_assoc($ID))
+  $DbResult = $System->Database->query('SELECT * FROM `ShoutBox` ORDER BY `ID` DESC LIMIT 30');
+  while($Line = $DbResult->fetch_assoc())
     echo('<tr><td><strong>'.$Line['User'].'</strong>: '.htmlspecialchars($Line['Text']).'</td></tr>');
   echo('</table></div>');
@@ -55 +52 @@
 function ShowTopBar()
 {
-  global $Config, $Database, $User, $System;
+  global $Config, $System, $User, $System;
   
   echo('<div class="Menu">');
@@ -61 +58 @@
   if($User->Licence(LICENCE_USER))
   {
-    $DbResult = $Database->SQLCommand('SELECT `Id`, `Name` FROM `Team` WHERE `Id`='.$User->Team);
-    $Team = mysql_fetch_assoc($DbResult);
+    $DbResult = $System->Database->query('SELECT `Id`, `Name` FROM `Team` WHERE `Id`='.$User->Team);
+    $Team = $DbResult->fetch_assoc();
 
     //echo('<span class="MenuItem">Moje překlady: <a href="">Dokončené</a> <a href="">Rozpracované</a> <a href="">Exporty</a> Tým: <a href="">'.$Team['name'].'</a></span>');
@@ -159 +156 @@
 function ShowTranslatedMenu()
 {
-  global $TranslationTree, $Config, $Database, $User, $System;
+  global $TranslationTree, $User, $System;
 
   echo('<strong>Překladové skupiny:</strong><br /><div id="TranslationMenu">');
@@ -182 +179 @@
 function ShowOnlineUserList()
 {
-  global $Database, $Moderators, $User;
+  global $System, $Moderators, $User;
   
   echo('Online překladatelé:<br />');
-  $ID = $Database->SQLCommand('SELECT `Name`, `GM`, `ID` FROM `User` WHERE `LastLogin` >= NOW() - 300 AND ((`LastLogout` < `LastLogin`) OR (ISNULL(`LastLogout`)))');
-  while($DbUser = mysql_fetch_assoc($ID))
+  $DbResult = $System->Database->query('SELECT `Name`, `GM`, `ID` FROM `User` WHERE `LastLogin` >= NOW() - 300 AND ((`LastLogout` < `LastLogin`) OR (ISNULL(`LastLogout`)))');
+  while($DbUser = $DbResult->fetch_assoc())
   {
     if($User->Licence(LICENCE_MODERATOR)) $Name = '<a href="user.php?user='.$DbUser['ID'].'">'.$DbUser['Name'].'</a>';
@@ -197 +194 @@
 function ShowPage()
 {
-  global $User, $Config, $Database, $RSSChannels, $PageFooterRequested, $System;  
-  
-  echo('<?xml version="1.0" encoding="'.$Config['Web']['Charset'].'"?>
+  global $User, $RSSChannels, $PageFooterRequested, $System;  
+  
+  echo('<?xml version="1.0" encoding="'.$System->Config['Web']['Charset'].'"?>
   <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="cz">'.
 '<head>'.
-'<meta http-equiv="content-type" content="application/xhtml+xml; charset='.$Config['Web']['Charset'].'" />'.
+'<meta http-equiv="content-type" content="application/xhtml+xml; charset='.$System->Config['Web']['Charset'].'" />'.
 '<meta name="keywords" content="wow, quest, questy, questů, preklad, mangos, překlad, překládání, přeložený, přeložení, čeština, world of warcraft, open source, free, addon" />'.
-'<meta name="description" content="'.$Config['Web']['Title'].'" />'.
+'<meta name="description" content="'.$System->Config['Web']['Title'].'" />'.
 '<meta name="robots" content="all" />'.
 '<link rel="stylesheet" href="'.$System->Link('/style/style.css').'" type="text/css" media="all" />'.
@@ -213 +210 @@
   foreach($RSSChannels as $Channel)
     echo(' <link rel="alternate" title="'.$Channel['Title'].'" href="'.$Channel['URL'].'" type="application/rss+xml" />');
-  echo('<title>'.$Config['Web']['Title'].'</title>
+  echo('<title>'.$System->Config['Web']['Title'].'</title>
 </head>
 <body>');
@@ -268 +265 @@
 function ShowFooter()
 {
-  global $Database, $Config, $ScriptStartTime, $PageFooterRequested, $User;
+  global $System, $ScriptStartTime, $PageFooterRequested, $User;
 
   if(isset($PageFooterRequested)) 
@@ -291 +288 @@
 
     echo('</td></tr>');
-    if($Config['Web']['ShowRuntimeInfo'] == true) echo('<tr><td colspan="3" style="text-align: center;">Doba generování: '.$ScriptGenerateDuration.' s / '.ini_get('max_execution_time').' s &nbsp;&nbsp; Použitá paměť: '.HumanSize(memory_get_peak_usage(FALSE)).' / '.ini_get('memory_limit').'B &nbsp;&nbsp; <a href="http://validator.w3.org/check?uri='.htmlentities('http://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'].'?'.$_SERVER['QUERY_STRING']).'">HTML validator</a></td></tr>');
+    if($System->Config['Web']['ShowRuntimeInfo'] == true) echo('<tr><td colspan="3" style="text-align: center;">Doba generování: '.$ScriptGenerateDuration.' s / '.ini_get('max_execution_time').' s &nbsp;&nbsp; Použitá paměť: '.HumanSize(memory_get_peak_usage(FALSE)).' / '.ini_get('memory_limit').'B &nbsp;&nbsp; <a href="http://validator.w3.org/check?uri='.htmlentities('http://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'].'?'.$_SERVER['QUERY_STRING']).'">HTML validator</a></td></tr>');
     echo('</table>'.
       '</body>'.
       '</html>');
-    $Database->Disconnect();
     $User->Store();
   } 

trunk/includes/global_function.php

@@ -36 +36 @@
 function GetPageList($TotalCount)
 {
-  global $Database, $Config;
+  global $System;
     
   $QueryItems = GetQueryStringArray($_SERVER['QUERY_STRING']);
   
-  $ItemPerPage = $Config['Web']['ItemsPerPage'];
-  $Around = round($Config['Web']['VisiblePagingItems'] / 2);
+  $ItemPerPage = $System->Config['Web']['ItemsPerPage'];
+  $Around = round($System->Config['Web']['VisiblePagingItems'] / 2);
   $Result = '';
   $PageCount = floor($TotalCount / $ItemPerPage) + 1;
@@ -218 +218 @@
 function GetLanguageList()
 { 
-  global $Database;
+  global $System;
   
   $Result = array();
-  $DbResult = $Database->SQLCommand('SELECT * FROM `Language` WHERE `Enabled` = 1');
-  while($DbRow = mysql_fetch_assoc($DbResult))
+  $DbResult = $System->Database->query('SELECT * FROM `Language` WHERE `Enabled` = 1');
+  while($DbRow = $DbResult->fetch_assoc())
     $Result[$DbRow['Id']] = $DbRow;
   return($Result);
@@ -229 +229 @@
 function GetTranslationTree()
 { 
-  global $Database;
+  global $System;
   
   $Result = array();
-  $DbResult = $Database->SQLCommand('SELECT *, UNIX_TIMESTAMP(`LastImport`) AS `LastImportTime` FROM `Group` ORDER BY `Name`');
-  while($DbRow = mysql_fetch_assoc($DbResult))
+  $DbResult = $System->Database->query('SELECT *, UNIX_TIMESTAMP(`LastImport`) AS `LastImportTime` FROM `Group` ORDER BY `Name`');
+  while($DbRow = $DbResult->fetch_assoc())
   {
     $DbRow['Items'] = array();
     $Result[$DbRow['Id']] = $DbRow;
   }
-  $DbResult = $Database->SQLCommand('SELECT * FROM `GroupItem` ORDER BY `Group`, `Sequence`');
-  while($DbRow = mysql_fetch_assoc($DbResult))
+  $DbResult = $System->Database->query('SELECT * FROM `GroupItem` ORDER BY `Group`, `Sequence`');
+  while($DbRow = $DbResult->fetch_assoc())
   {
     $Result[$DbRow['Group']]['Items'][] = $DbRow;
@@ -250 +250 @@
 function WriteLog($Text, $Type)
 {
-  global $Database, $Config, $User;
+  global $System, $User;
  
   if(!isset($_SERVER['REMOTE_ADDR'])) $IP = 'Konzole';
     else $IP = addslashes($_SERVER['REMOTE_ADDR']);
 
-  $Database->SelectDatabase($Config['Database']['Database']);    
+  if(isset($User->Id)) $UserId = $User->Id;
+    else $UserId = 0;
   $Query = 'INSERT INTO `Log` ( `User` , `Type` , `Text` , `Date` , `IP` )
-   VALUES ('.$User->Id.', '.$Type.', "'.addslashes($Text).'", NOW(), "'.$IP.'")';
-  $Database->SQLCommand($Query);
+   VALUES ('.$UserId.', '.$Type.', "'.addslashes($Text).'", NOW(), "'.$IP.'")';
+  $System->Database->query($Query);
 }
 
@@ -273 +274 @@
 function FollowingTran($TextID, $Table, $GroupId, $Prev = false) 
 { 
-  global $Database;
+  global $System;
   
   if($Prev)
@@ -283 +284 @@
   }
   
-  $Next = mysql_fetch_assoc($Database->SQLCommand($sql));
+  $DbResult = $System->Database->query($sql);
+  $Next = $DbResult->fetch_assoc();
   if($Next) 
   {
     if($Prev) echo('<a href="form.php?group='.$GroupId.'&amp;ID='.$Next['ID'].'">Předcházející '.$Next['ID'].'</a> ');
     else echo('<a href="form.php?group='.$GroupId.'&amp;ID='.$Next['ID'].'">Následující '.$Next['ID'].'</a> ');
-      return 'form.php?group='.$GroupId.'&amp;ID='.$Next['ID'];
+      return('form.php?group='.$GroupId.'&amp;ID='.$Next['ID']);
   }
 }
@@ -294 +296 @@
 function GetBuildNumber($Version)
 {
-  global $Database, $BuildNumbers;
+  global $System, $BuildNumbers;
   
   if(isset($BuildNumbers[$Version]) == false) 
   {
     $sql = 'SELECT `BuildNumber` FROM `ClientVersion` WHERE `Version` = "'.$Version.'"';
-    $DbRow = mysql_fetch_assoc($Database->SQLCommand($sql));
+    $DbResult = $System->Database->query($sql);
+    $DbRow = $DbResult->fetch_assoc();
     $BuildNumbers[$Version] = $DbRow['BuildNumber'];
   }
@@ -307 +310 @@
 function GetVersionWOW($BuildNumber)
 {
-  global $Database, $VersionsWOW;
+  global $System, $VersionsWOW;
   
   if(isset($VersionsWOW[$BuildNumber]) == false) 
   {
     $sql = 'SELECT `Version` FROM `ClientVersion` WHERE `BuildNumber` = "'.$BuildNumber.'"';
-    $Version = mysql_fetch_assoc($Database->SQLCommand($sql));
+    $DbResult = $System->Database->query($sql);
+    $Version = $DbResult->fetch_assoc();
     $VersionsWOW[$BuildNumber] = $Version['Version'];
   }
@@ -442 +446 @@
 }
 
-
 function GetTranslatNames($Text,$mode,$TablesColumn) 
 {
-  global $Database;
+  global $System;
   
  /* $TablesID = array('gameobject' => 5,
@@ -482 +485 @@
       }
       }
-      $where = substr($where,0,strlen($where)-4);
+      $where = substr($where, 0, strlen($where) - 4);
       $where .= ')';
       if ($SqlOK) {
-        $ID = $Database->SQLCommand($sql.$where.$groupby);
+        $DbResult = $System->Database->query($sql.$where.$groupby);
     //  echo ($sql.'|'.$where.'|'.$groupby);
-        while($Line = mysql_fetch_assoc($ID)) {
-        $buff[] = array($Line['ID'],GetIDbyName($Table),$Line[$Column],$Line['Tran']);
+        while($Line = $DbResult->fetch_assoc()) 
+        {
+          $buff[] = array($Line['ID'], GetIDbyName($Table), $Line[$Column], $Line['Tran']);
         }
     }

trunk/includes/system.php

@@ -1 +1 @@
 <?php
 
-//include_once('database.php');
+include_once('Database.php');
 
 class Module
@@ -22 +22 @@
   var $Config;
   
+  function __construct()
+  {
+    $this->Database = new Database();
+    $this->Config = array();
+  }
+  
   function Init()
   {
     include('config.php');
     $this->Config = $Config;
-    $this->Database = new mysqli($this->Config['Database']['Host'], $this->Config['Database']['User'], $this->Config['Database']['Password'], $this->Config['Database']['Database']);
-    $this->Database->query('SET NAMES '.$this->Config['Database']['Charset']);
+    $this->Database->HostName = $this->Config['Database']['Host'];
+    $this->Database->UserName = $this->Config['Database']['User'];
+    $this->Database->Password = $this->Config['Database']['Password'];
+    $this->Database->Schema = $this->Config['Database']['Database'];
+    $this->Database->Charset = $this->Config['Database']['Charset'];
+    $this->Database->ShowSQLQuery = $this->Config['Web']['ShowSQLQuery'];
+    $this->Database->ShowSQLError = $this->Config['Web']['ShowSQLError'];
+    $this->Database->open();
   }
   

trunk/index.php

@@ -13 +13 @@
 function ShowNews()
 {
-  global $Database;
+  global $System;
 
   $Output = '<strong>Změny systému:</strong><div class="NewsBox">';
-  $DbResult = $Database->SQLCommand('SELECT `News`.`Time`, `User`.`Name`, `News`.`Text` FROM `News` JOIN `User` ON `User`.`ID` = `News`.`User` ORDER BY `Time` DESC LIMIT 10');
-  while($DbRow = mysql_fetch_assoc($DbResult))
+  $DbResult = $System->Database->query('SELECT `News`.`Time`, `User`.`Name`, `News`.`Text` FROM `News` JOIN `User` ON `User`.`ID` = `News`.`User` ORDER BY `Time` DESC LIMIT 10');
+  while($DbRow = $DbResult->fetch_assoc())
     $Output .= '<div><strong>'.$DbRow['Name'].' ('.HumanDate($DbRow['Time']).')</strong> <br />'.$DbRow['Text'].'</div>';  
   $Output .= '<a href="action.php?action=news">Všechny zprávy</a>';
@@ -56 +56 @@
 function ShowRSSChannel()
 {
-  global $Database, $Config, $System;
+  global $System, $Config, $System;
   
   $Items = array();  
   if($_GET['rss'] == 'news')
   {
-    $DbResult = $Database->SQLCommand('SELECT UNIX_TIMESTAMP(`News`.`Time`) AS `UnixTime`, `News`.`Time`, `User`.`Name`, `News`.`Text` FROM `News` JOIN `User` ON `User`.`ID` = `News`.`User` ORDER BY `Time` DESC LIMIT 10');
-    while($DbRow = mysql_fetch_assoc($DbResult)) 
+    $DbResult = $System->Database->query('SELECT UNIX_TIMESTAMP(`News`.`Time`) AS `UnixTime`, `News`.`Time`, `User`.`Name`, `News`.`Text` FROM `News` JOIN `User` ON `User`.`ID` = `News`.`User` ORDER BY `Time` DESC LIMIT 10');
+    while($DbRow = $DbResult->fetch_assoc()) 
     {
       $Items[] = array
@@ -83 +83 @@
   if($_GET['rss'] == 'translation')
   {
-    $DbResult = $Database->SQLCommand('SELECT UNIX_TIMESTAMP(`Date`) AS `Date`, `User`.`Name` AS `UserName`, `Text` FROM `Log` JOIN `User` ON `User`.`ID` = `Log`.`User` WHERE `Type` = 1 ORDER BY `Date` DESC LIMIT 100');
-    while($DbRow = mysql_fetch_assoc($DbResult)) 
+    $DbResult = $System->Database->query('SELECT UNIX_TIMESTAMP(`Date`) AS `Date`, `User`.`Name` AS `UserName`, `Text` FROM `Log` JOIN `User` ON `User`.`ID` = `Log`.`User` WHERE `Type` = 1 ORDER BY `Date` DESC LIMIT 100');
+    while($DbRow = $DbResult->fetch_assoc()) 
     {
       $Items[] = array
@@ -107 +107 @@
     $TitleLength = 50;
     mb_internal_encoding('utf-8');
-    $DbResult = $Database->SQLCommand('SELECT UNIX_TIMESTAMP(`Date`) AS `UnixDate`, `User`, `Text` FROM `ShoutBox` ORDER BY `ID` DESC LIMIT 20');
-    while($DbRow = mysql_fetch_assoc($DbResult)) 
+    $DbResult = $Sytem->Database->query('SELECT UNIX_TIMESTAMP(`Date`) AS `UnixDate`, `User`, `Text` FROM `ShoutBox` ORDER BY `ID` DESC LIMIT 20');
+    while($DbRow = $DbResult->fetch_assoc()) 
     {
       $Title = mb_substr($DbRow['Text'], 0, $TitleLength);

trunk/log.php

@@ -9 +9 @@
     else $Where = '';
   $sql = 'SELECT *, UNIX_TIMESTAMP(`Date`) AS `TimeCreate`, (SELECT `User`.`Name` FROM `User` WHERE `User`.`ID` = `Log`.`User`) AS `User` FROM `Log`'.$Where.' ORDER BY `Date` DESC LIMIT 100';
-  $ID = $Database->SQLCommand($sql);
-  while($Line = mysql_fetch_assoc($ID)) 
+  $DbResult = $System->Database->query($sql);
+  while($Line = $DbResult->fetch_assoc()) 
   {
-    $DbResult = $Database->SQLCommand('SELECT * FROM `LogType` WHERE `Id`='.$Line['Type']);
-    $LogType = mysql_fetch_assoc($DbResult);
+    $DbResult2 = $System->Database->query('SELECT * FROM `LogType` WHERE `Id`='.$Line['Type']);
+    $LogType = $DbResult2->fetch_assoc();
     
     $Items[] = array
@@ -49 +49 @@
     echo('<strong>Filtr: </strong>');
     echo('<span style="color:black"><a href="log.php?type=" title="Bez filtrování">Všechny</a></span> ');
-    $DbResult = $Database->SQLCommand('SELECT * FROM `LogType`');
-    while($LogType = mysql_fetch_assoc($DbResult))
+    $DbResult = $System->Database->query('SELECT * FROM `LogType`');
+    while($LogType = $DbResult->fetch_assoc())
     {
       echo('<a href="log.php?type='.$LogType['Id'].'" style="color:'.$LogType['Color'].'" title="'.$LogType['Name'].'">'.$LogType['Name'].'</a> ');
@@ -66 +66 @@
   //if(($Where != '') and (array_key_exists('group', $_SESSION))) $Where .= ' AND text LIKE "%'.$TranslationTree[$_SESSION['group']]['Name'].'%"';
 
-  $DbResult = $Database->SQLCommand('SELECT COUNT(*) FROM `Log` '.$Where);
-  $DbRow = mysql_fetch_row($DbResult);
+  $DbResult = $System->Database->query('SELECT COUNT(*) FROM `Log` '.$Where);
+  $DbRow = $DbResult->fetch_row();
   $PageList = GetPageList($DbRow[0]);    
   
@@ -84 +84 @@
   $sql = 'SELECT *, `LogType`.`Color` AS `LogColor`, (SELECT `User`.`Name` FROM `User` WHERE `User`.`ID` = `Log`.`User`) AS `UserName` FROM `Log` LEFT JOIN `LogType` ON `LogType`.`Id`=`Log`.`Type` '.$Where.$Order['SQL'].$PageList['SQLLimit'];
   //echo($sql);
-  $ID = $Database->SQLCommand($sql);
-  while($Line = mysql_fetch_assoc($ID)) 
+  $DbResult = $System->Database->query($sql);
+  while($Line = $DbResult->fetch_assoc()) 
   {
     echo('<tr><td>'.$Line['Date'].'</td><td><span style="color: '.$Line['LogColor'].'">'.$Line['Text'].'</span></td><td>'.$Line['UserName'].'</td><td>'.$Line['IP'].'</td></tr>');

trunk/registrace.php

@@ -22 +22 @@
         if($Pass == $Pass2) 
         {
-          $Line = mysql_fetch_row($Database->SQLCommand('SELECT * FROM `User` WHERE `Name` = "'.$UserName.'"'));
+          $DbResult = $System->Database->query('SELECT * FROM `User` WHERE `Name` = "'.$UserName.'"');
+          $Line = $DbResult->fetch_row();
           if(!$Line) 
           {
             $Salt = $User->GetPasswordSalt();
-            $Database->SQLCommand('INSERT INTO `User` (`Name` , `Pass` , `Salt`, `LastIP` , `LastLogin` , `Email` , `Language` , `Team` , `NeedUpdate`, `RegistrationTime` ) VALUES ("'.$UserName.'", '.$User->CryptPasswordSQL('"'.$Pass.'"', '"'.$Salt.'"').', "'.$Salt.'", "'.$_SERVER['REMOTE_ADDR'].'", NOW(), "'.$Email.'", '.$Language.', '.$Team.', 1, NOW())');
+            $System->Database->query('INSERT INTO `User` (`Name` , `Pass` , `Salt`, `LastIP` , `LastLogin` , `Email` , `Language` , `Team` , `NeedUpdate`, `RegistrationTime` ) VALUES ("'.$UserName.'", '.$User->CryptPasswordSQL('"'.$Pass.'"', '"'.$Salt.'"').', "'.$Salt.'", "'.$_SERVER['REMOTE_ADDR'].'", NOW(), "'.$Email.'", '.$Language.', '.$Team.', 1, NOW())');
             $Message = 'Registrace proběhla úspěšně.<br /><br/>'.
-            'Přečtěte si pozorně <a href="'.$System->Link('/info.php').'</a>">pokyny pro překladání</a> a můžete pak hned začít překládat.';
+            'Přečtěte si pozorně <a href="'.$System->Link('/info.php').'">pokyny pro překladání</a> a můžete pak hned začít překládat.';
             $User->Login($UserName, $Pass);
             WriteLog('Uživatel se zaregistroval: '.$UserName, LOG_TYPE_USER);      
@@ -74 +75 @@
       <td><select name="Team"><option value="0">Žádného</option>
       ');
-    $ID = $Database->SQLCommand('SELECT `Name`, `Id` FROM `Team`');
-    while($Line = mysql_fetch_assoc($ID))
+    $DbResult = $System->Database->query('SELECT `Name`, `Id` FROM `Team`');
+    while($Line = $DbResult->fetch_assoc())
     {
       echo('<option value="0'.$Line['Id'].'">'.$Line['Name'].'</option>');

trunk/save.php

@@ -155 +155 @@
   $next = FollowingTran($TextID, $Table, $GroupId);
   echo('<br /><br />');
-  $redirecting = mysql_fetch_assoc($Database->SQLCommand('SELECT `Redirecting` FROM `User` WHERE `ID`='.$User->Id));
+  $DbResult = $System->Database->query('SELECT `Redirecting` FROM `User` WHERE `ID`='.$User->Id)
+  $redirecting = $DbResult->fetch_assoc();
     
   switch($redirecting['Redirecting']) 
@@ -181 +182 @@
     
   // Aktualizace informace o nutnosti načíst XP
-  $Database->SQLCommand('UPDATE `User` SET `NeedUpdate` = 1 WHERE `ID` = '.$User->Id); 
+  $System->Database->query('UPDATE `User` SET `NeedUpdate` = 1 WHERE `ID` = '.$User->Id); 
   } else echo('Položka nenalezena');
 } else 

trunk/statistic.php

@@ -8 +8 @@
 function ShowStatTable()
 {
-  global $Database, $Config;
+  global $System;
   
   $LanguageId = LoadLanguageIdParameter();
@@ -15 +15 @@
   $GroupListQuery = 'SELECT `Group`.* FROM `Group`';
   $Query = '';
-  $DbResult = $Database->SQLCommand($GroupListQuery);
-  while($DbRow = mysql_fetch_assoc($DbResult))
+  $DbResult = $System->Database->query($GroupListQuery);
+  while($DbRow = $DbResult->fetch_assoc())
   {
     $Query .= 'SELECT (SELECT COUNT(DISTINCT(`Entry`)) FROM ('.
@@ -29 +29 @@
   $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($PageList['Output']);
@@ -47 +47 @@
   $Translated = 0;
   $Total = 0;
-  $ID = $Database->SQLCommand('SELECT *, ROUND(`Translated` / `Total` * 100, 2) AS `Percent` FROM ('.$Query.') AS `C3` '.$Order['SQL'].$PageList['SQLLimit']);
-  while($Group = mysql_fetch_assoc($ID)) 
+  $DbResult = $System->Database->query('SELECT *, ROUND(`Translated` / `Total` * 100, 2) AS `Percent` FROM ('.$Query.') AS `C3` '.$Order['SQL'].$PageList['SQLLimit']);
+  while($Group = $DbResult->fetch_assoc()) 
   {
     echo('<tr><td>'.$Group['Name'].'</td><td>'.$Group['Translated'].'</td><td>'.$Group['Total'].'</td><td>'.ProgressBar(150, $Group['Percent']).'</td></tr>');
@@ -83 +83 @@
 <div>Počet stáhnutí přeložených textů v SQL souboru: <strong>');
        
-$ID = $Database->SQLCommand('SELECT count(distinct(`IP`)) FROM `Log` WHERE `Type` = 2');
-$Line = mysql_fetch_row($ID);
+$ID = $System->Database->query('SELECT count(distinct(`IP`)) FROM `Log` WHERE `Type` = 2');
+$Line = $ID->fetch_row();
 echo($Line[0]);
 
@@ -90 +90 @@
 <div>Počet stáhnutí: <strong>');
       
-$ID = $Database->SQLCommand('SELECT count(distinct(`IP`)) FROM `Log` WHERE `Type` = 0');
-$Line = mysql_fetch_row($ID);
+$ID = $System->Database->query('SELECT count(distinct(`IP`)) FROM `Log` WHERE `Type` = 0');
+$Line = $ID->fetch_row();
 echo($Line[0]);
 

trunk/team.php

@@ -8 +8 @@
 function ShowTeamList()
 {  
-  global $Config, $Database, $User;
+  global $Config, $System, $User;
   
   echo('<h3>Seznam překladatelských týmů</h3>');
   echo('Týmy jsou seskupení překladatelů, kteří se hlásí k něčemu společnému jako např. WoW serveru, způsobu překladu, ke stejnému hernímu spolku, aj. Být členem týmu samo o sobě nemá žádný zásadní důsledek a spíše to může pomoci se lépe orientovat mezi překladateli někomu, kdo sestavuje export.<br/>');
-  $DbResult = $Database->SQLCommand('SELECT COUNT(*) FROM `Team`');
-  $DbRow = mysql_fetch_row($DbResult);
+  $DbResult = $System->Database->query('SELECT COUNT(*) FROM `Team`');
+  $DbRow = $DbResult->fetch_row();
   $PageList = GetPageList($DbRow[0]);    
 
@@ -35 +35 @@
     if (array_key_exists('search', $_GET) and ($_GET['search'] == '')) $_SESSION['search'] = '';
 
-    $ID = $Database->SQLCommand('SELECT *, (SELECT COUNT(*) FROM `User` WHERE `User`.`Team` = `Team`.`Id`) AS `NumberUser`, (SELECT `Name` FROM `User` WHERE `User`.`ID`=`Team`.`Leader`) AS `LeaderName` FROM `Team` '.$_SESSION['search'].$Order['SQL'].$PageList['SQLLimit']);
-    while($Team = mysql_fetch_assoc($ID)) 
+    $DbResult = $System->Database->query('SELECT *, (SELECT COUNT(*) FROM `User` WHERE `User`.`Team` = `Team`.`Id`) AS `NumberUser`, (SELECT `Name` FROM `User` WHERE `User`.`ID`=`Team`.`Leader`) AS `LeaderName` FROM `Team` '.$_SESSION['search'].$Order['SQL'].$PageList['SQLLimit']);
+    while($Team = $DbResult->fetch_assoc()) 
     {
       echo('<tr>'.
@@ -61 +61 @@
 function TeamJoin()
 {
-  global $Database, $User;
+  global $System, $User;
   
   if($User->Licence(LICENCE_USER))
@@ -67 +67 @@
     if(array_key_exists('id', $_GET))
     { 
-      $Database->SQLCommand('UPDATE `User` SET `Team` = '.$_GET['id'].' WHERE `ID` = '.$User->Id); 
+      $System->Database->query('UPDATE `User` SET `Team` = '.$_GET['id'].' WHERE `ID` = '.$User->Id); 
       echo('<strong>Vstoupil jsi do týmu</strong><br /><br />');    
       WriteLog('Uživatel vstoupil do týmu '.$_GET['id'], LOG_TYPE_USER);
 
       // Delete all teams without users
-      $Database->SQLCommand('DELETE FROM `Team` WHERE (SELECT COUNT(*) FROM `User` WHERE `User`.`Team` = `Team`.`Id`) = 0');
+      $System->Database->query('DELETE FROM `Team` WHERE (SELECT COUNT(*) FROM `User` WHERE `User`.`Team` = `Team`.`Id`) = 0');
         
       // Set new leader for teams where old leader went to other team
-      $Database->SQLCommand('UPDATE `Team` SET `Leader`=(SELECT `Id` FROM `User` WHERE `User`.`Team`=`Team`.`Id` ORDER BY `User`.`RegistrationTime` LIMIT 1) WHERE `Leader` NOT IN (SELECT `ID` FROM `User` WHERE `User`.`Team`=`Team`.`Id`);');
+      $System->Database->query('UPDATE `Team` SET `Leader`=(SELECT `Id` FROM `User` WHERE `User`.`Team`=`Team`.`Id` ORDER BY `User`.`RegistrationTime` LIMIT 1) WHERE `Leader` NOT IN (SELECT `ID` FROM `User` WHERE `User`.`Team`=`Team`.`Id`);');
         
       ShowTeamList();
@@ -84 +84 @@
 function TeamCreateFinish()
 {
-  global $Database, $User;
+  global $System, $User;
   
   if($User->Licence(LICENCE_USER))
@@ -90 +90 @@
     if(array_key_exists('Name', $_POST) and array_key_exists('Description', $_POST))
     {
-      $DbResult = $Database->SQLCommand('SELECT COUNT(*) FROM `Team` WHERE `Name` = "'.trim($_POST['Name']).'"');  
-      $DbRow = mysql_fetch_row($DbResult);
+      $DbResult = $System->Database->query('SELECT COUNT(*) FROM `Team` WHERE `Name` = "'.trim($_POST['Name']).'"');  
+      $DbRow = $DbResult->fetch_row();
       $Count = $DbRow[0];
       if(($Count == 0) and ($_POST['Name'] != ''))
       {
-        $Database->SQLCommand('INSERT INTO `Team` (`Name` ,`Description`, `URL`, `TimeCreate`,`Leader`) VALUES ("'.trim($_POST['Name']).'", "'.trim($_POST['Description']).'", "'.$_POST['URL'].'", NOW(), '.$User->Id.')');  
-        $Database->SQLCommand('UPDATE `User` SET `Team` = '.mysql_insert_id().' WHERE `ID` = '.$User->Id); 
+        $System->Database->query('INSERT INTO `Team` (`Name` ,`Description`, `URL`, `TimeCreate`,`Leader`) VALUES ("'.trim($_POST['Name']).'", "'.trim($_POST['Description']).'", "'.$_POST['URL'].'", NOW(), '.$User->Id.')');  
+        $System->Database->query('UPDATE `User` SET `Team` = '.mysql_insert_id().' WHERE `ID` = '.$User->Id); 
         echo('<strong>Překladatelský tým vytvořen</strong><br /><br />');
         WriteLog('Překladatelský tým vytvořen '.$_POST['Name'], LOG_TYPE_USER);
 
         // Delete all teams without users
-        $Database->SQLCommand('DELETE FROM `Team` WHERE (SELECT COUNT(*) FROM `User` WHERE `User`.`Team` = `Team`.`Id`) = 0');    
+        $System->Database->query('DELETE FROM `Team` WHERE (SELECT COUNT(*) FROM `User` WHERE `User`.`Team` = `Team`.`Id`) = 0');    
       } else echo('Již existuje tým se stejným jménem');
     } else echo('Chybí údaje formuláře');
@@ -110 +110 @@
 function TeamModify()
 {
-  global $Database, $User;
+  global $System, $User;
   
   if($User->Licence(LICENCE_USER))
@@ -116 +116 @@
     if(array_key_exists('id', $_GET))
     {
-      $DbResult = $Database->SQLCommand('SELECT * FROM `Team` WHERE `Id`='.$_GET['id'].' AND `Leader`='.$User->Id);
-      if(mysql_num_rows($DbResult) > 0)
-      {
-        $Team = mysql_fetch_assoc($DbResult);
+      $DbResult = $System->Database->query('SELECT * FROM `Team` WHERE `Id`='.$_GET['id'].' AND `Leader`='.$User->Id);
+      if($DbResult->num_rows > 0)
+      {
+        $Team = $DbResult->fetch_assoc();
         echo('<form action="?action=finish_modify&amp;id='.$_GET['id'].'" method="post">'.
       '<fieldset><legend>Nastavení týmu</legend>'.
@@ -134 +134 @@
 function TeamModifyFinish()
 {
-  global $Database, $User;
+  global $System, $User;
   
   if($User->Licence(LICENCE_USER))
@@ -140 +140 @@
     if(array_key_exists('id', $_GET) and array_key_exists('Name', $_POST) and array_key_exists('Description', $_POST) and array_key_exists('URL', $_POST))
     {
-      $DbResult = $Database->SQLCommand('SELECT * FROM `Team` WHERE `Id`='.$_GET['id'].' AND `Leader`='.$User->Id);
-      if(mysql_num_rows($DbResult) > 0)
-      {
-        $Team = mysql_fetch_assoc($DbResult);
-        $DbResult = $Database->SQLCommand('SELECT COUNT(*) FROM `Team` WHERE `Name` = "'.trim($_POST['Name']).'"');  
-        $DbRow = mysql_fetch_row($DbResult);
+      $DbResult = $System->Database->query('SELECT * FROM `Team` WHERE `Id`='.$_GET['id'].' AND `Leader`='.$User->Id);
+      if($DbResult->num_rows > 0)
+      {
+        $Team = $DbResult->fetch_assoc();
+        $DbResult = $System->Database->query('SELECT COUNT(*) FROM `Team` WHERE `Name` = "'.trim($_POST['Name']).'"');  
+        $DbRow = $DbResult->fetch_row();
         $Count = $DbRow[0];
         if(($Count == 0) and ($_POST['Name'] != ''))
         {          
-          $Database->SQLCommand('UPDATE `Team` SET `Name`="'.$_POST['Name'].'", `Description`="'.$_POST['Description'].'", `URL`="'.$_POST['URL'].'" WHERE Id='.$Team['Id']);
+          $System->Database->query('UPDATE `Team` SET `Name`="'.$_POST['Name'].'", `Description`="'.$_POST['Description'].'", `URL`="'.$_POST['URL'].'" WHERE Id='.$Team['Id']);
           echo('Nastavení týmu uloženo.<br/>');
           WriteLog('Překladatelský tým upraven '.$_POST['Name'], LOG_TYPE_USER);
@@ -177 +177 @@
 function TeamShow()
 {
-  global $Database, $TranslationTree, $User, $Config;
+  global $System, $TranslationTree, $User, $Config;
   
   if(array_key_exists('id', $_GET) and is_numeric($_GET['id']))
@@ -183 +183 @@
     ImgLevelUpdate();
       
-    $DbResult = $Database->SQLCommand('SELECT *, (SELECT COUNT(*) FROM `User` WHERE `Team` = `Team`.`Id`) AS `NumberUser`, (SELECT SUM(`TranslatedCount`) FROM `User` WHERE `team` = `Team`.`Id`) AS `NumberTranslate` FROM `Team` WHERE `Id`='.$_GET['id']);
-    if(mysql_num_rows($DbResult) > 0)
-    {
-      $Team = mysql_fetch_assoc($DbResult);
-      $DbResult = $Database->SQLCommand('SELECT `Name` FROM `User` WHERE `ID`='.$Team['Leader']);
-      if(mysql_num_rows($DbResult) > 0) 
-      {
-        $Leader = mysql_fetch_assoc($DbResult);
+    $DbResult = $System->Database->query('SELECT *, (SELECT COUNT(*) FROM `User` WHERE `Team` = `Team`.`Id`) AS `NumberUser`, (SELECT SUM(`TranslatedCount`) FROM `User` WHERE `team` = `Team`.`Id`) AS `NumberTranslate` FROM `Team` WHERE `Id`='.$_GET['id']);
+    if($DbResult->num_rows > 0)
+    {
+      $Team = $DbResult->fetch_assoc();
+      $DbResult2 = $System->Database->query('SELECT `Name` FROM `User` WHERE `ID`='.$Team['Leader']);
+      if($DbResult2->num_rows > 0) 
+      {
+        $Leader = $DbResult2->fetch_assoc();
         $Leader = $Leader['Name'];
       } else $Leader = '';
@@ -210 +210 @@
   $GroupListQuery = 'SELECT `Group`.* FROM `Group`';
   $Query = '';
-  $DbResult = $Database->SQLCommand($GroupListQuery);
-  while($DbRow = mysql_fetch_assoc($DbResult))
+  $DbResult = $System->Database->query($GroupListQuery);
+  while($DbRow = $DbResult->fetch_assoc())
   {
     $Query .= 'SELECT (SELECT COUNT(DISTINCT(`Entry`)) FROM ('.
@@ -224 +224 @@
   $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($PageList['Output']);
@@ -242 +242 @@
   $Translated = 0;
   $Total = 0;
-  $ID = $Database->SQLCommand('SELECT *, ROUND(`Translated` / `Total` * 100, 2) AS `Percent` FROM ('.$Query.') AS `C3` '.$Order['SQL'].$PageList['SQLLimit']);
-  while($Group = mysql_fetch_assoc($ID)) 
+  $DbResult = $System->Database->query('SELECT *, ROUND(`Translated` / `Total` * 100, 2) AS `Percent` FROM ('.$Query.') AS `C3` '.$Order['SQL'].$PageList['SQLLimit']);
+  while($Group = $DbResult->fetch_assoc()) 
   {
     echo('<tr><td>'.$Group['Name'].'</td><td>'.$Group['Translated'].'</td><td>'.$Group['Total'].'</td><td>'.ProgressBar(150, $Group['Percent']).'</td></tr>');
@@ -259 +259 @@
 function TeamLeave()
 {
-  global $Database, $User;
-  
-  if($User->Licence(LICENCE_USER))
-  {   
-    $Database->SQLCommand('UPDATE `User` SET `Team` = 0 WHERE `ID` = '.$User->Id); 
+  global $System, $User;
+  
+  if($User->Licence(LICENCE_USER))
+  {   
+    $System->Database->query('UPDATE `User` SET `Team` = 0 WHERE `ID` = '.$User->Id); 
     echo('<strong>Nyní nejste členem žádného týmu</strong><br /><br />');    
     WriteLog('Uživatel vystoupil z týmu', LOG_TYPE_USER);
 
     // Delete all teams without users
-    $Database->SQLCommand('DELETE FROM `Team` WHERE (SELECT COUNT(*) FROM `User` WHERE `User`.`Team` = `Team`.`Id`) = 0');
+    $System->Database->query('DELETE FROM `Team` WHERE (SELECT COUNT(*) FROM `User` WHERE `User`.`Team` = `Team`.`Id`) = 0');
         
     // Set new leader for teams where old leader went to other team
-    $Database->SQLCommand('UPDATE `Team` SET `Leader`=(SELECT `Id` FROM `User` WHERE `User`.`Team`=`Team`.`Id` ORDER BY `User`.`RegistrationTime` LIMIT 1) WHERE `Leader` NOT IN (SELECT `ID` FROM `User` WHERE `User`.`Team`=`Team`.`Id`);');
+    $System->Database->query('UPDATE `Team` SET `Leader`=(SELECT `Id` FROM `User` WHERE `User`.`Team`=`Team`.`Id` ORDER BY `User`.`RegistrationTime` LIMIT 1) WHERE `Leader` NOT IN (SELECT `ID` FROM `User` WHERE `User`.`Team`=`Team`.`Id`);');
         
     ShowTeamList();

trunk/user.php

@@ -24 +24 @@
 {  
   $Query = 'SELECT * FROM `User` WHERE `ID` = '.$_GET['user'];
-  $UserLine = mysql_fetch_array($Database->SQLCommand($Query));
+  $DbResult = $System->Database->query($Query);
+  $UserLine = $DbResult->fetch_array();
    
   echo('ID: <strong>'.$UserLine['ID'].'</strong><br />');

trunk/userlist.php

@@ -26 +26 @@
 //if($_SESSION['Where'] <> '') echo(' <a href="?action=nofilter">Zrušit filtr uživatelů</a><br />');
 
-$DbResult = $Database->SQLCommand('SELECT COUNT(*) FROM `User`'.$_SESSION['Where']);
-$DbRow = mysql_fetch_row($DbResult);
+$DbResult = $System->Database->query('SELECT COUNT(*) FROM `User`'.$_SESSION['Where']);
+$DbRow = $DbResult->fetch_row();
 $PageList = GetPageList($DbRow[0]);    
 
@@ -48 +48 @@
 $Query = 'SELECT `ID`, `User`.`Name`, `LastLogin`, `GM`, `XP`, `TranslatedCount`, `RegistrationTime` FROM `User` '.$_SESSION['Where'].$Order['SQL'].$PageList['SQLLimit'];
 
-$ID = $Database->SQLCommand($Query);
-while($Line = mysql_fetch_assoc($ID)) 
+$DbResult = $System->Database->query($Query);
+while($Line = $DbResult->fetch_assoc()) 
 {
   if($User->Licence(LICENCE_MODERATOR)) 

trunk/version.php

@@ -5 +5 @@
 ShowPage();
 
-$DbResult = $Database->SQLCommand('SELECT COUNT(*) FROM `ClientVersion`');
-$DbRow = mysql_fetch_row($DbResult);
+$DbResult = $System->Database->query('SELECT COUNT(*) FROM `ClientVersion`');
+$DbRow = $DbResult->fetch_row();
 $PageList = GetPageList($DbRow[0]);    
 
@@ -22 +22 @@
 echo($Order['Output']);
 
-$DbResult = $Database->SQLCommand('SELECT * FROM ClientVersion '.$Order['SQL'].$PageList['SQLLimit']);
-while($Version = mysql_fetch_assoc($DbResult))
+$DbResult = $System->Database->query('SELECT * FROM ClientVersion '.$Order['SQL'].$PageList['SQLLimit']);
+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></tr>');