Changeset 365 for trunk

Timestamp:

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

Author:

george

Message:

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

Location:

trunk

Files:

• Options.php (modified) (2 diffs)
• TranslationList.php (modified) (23 diffs)
• action.php (modified) (14 diffs)
• admin.php (modified) (6 diffs)
• banners.php (modified) (1 diff)
• banners/banner.php (modified) (1 diff)
• comparison.php (modified) (1 diff)
• dictionary.php (modified) (5 diffs)
• download.php (modified) (6 diffs)
• export/export.php (modified) (10 diffs)
• export/index.php (modified) (14 diffs)
• export/process_aowow_export.php (modified) (1 diff)
• form.php (modified) (6 diffs)
• img_level.php (modified) (4 diffs)
• img_statistic.php (modified) (2 diffs)
• import/import_dbc.php (modified) (1 diff)
• includes/global.php (modified) (7 diffs)
• includes/global_function.php (modified) (3 diffs)
• index.php (modified) (6 diffs)
• log.php (modified) (5 diffs)
• registrace.php (modified) (2 diffs)
• save.php (modified) (5 diffs)
• sql/updates/364.sql (added)
• statistic.php (modified) (2 diffs)
• team.php (modified) (6 diffs)
• user.php (modified) (2 diffs)
• userlist.php (modified) (5 diffs)

trunk/Options.php

@@ -17 +17 @@
     $redirecting = $_POST['redirecting'];
 
-   // $Line = mysql_fetch_assoc($Database->SQLCommand("SELECT * FROM user WHERE ID = ".$_SESSION['UserID']));
     if(($_SESSION['Pass'] == $OldPass) and ($NewPass == $NewPass2)) 
     {
       // Update password
       $Salt = GetPasswordSalt();
-      $Database->SQLCommand('UPDATE user SET pass = sha1(CONCAT(sha1("'.$NewPass.'"), "'.$Salt.'")), Salt="'.$Salt.'" WHERE ID = '.$_SESSION['UserID']);
+      $Database->SQLCommand('UPDATE `User` SET `Pass` = sha1(CONCAT(sha1("'.$NewPass.'"), "'.$Salt.'")), `Salt`="'.$Salt.'" WHERE `ID` = '.$_SESSION['UserID']);
       echo('Heslo změněno!<br />');
     } else echo('<br />Hesla se neshodují!<br />');
     
-    $Database->SQLCommand('UPDATE user SET Email = "'.$Email.'", Language = "'.$Language.'", redirecting = "'.$redirecting.'" WHERE ID = '.$_SESSION['UserID']);
+    $Database->SQLCommand('UPDATE `User` SET `Email` = "'.$Email.'", `Language` = "'.$Language.'", `Redirecting` = "'.$redirecting.'" WHERE `ID` = '.$_SESSION['UserID']);
     echo('Úprava nastavení proběhla v pořádku, Email: <b>'.$Email.'</b> Uživatel: <b>'.$User.'</b><br />');
     WriteLog('Úprava nastavení!', LOG_TYPE_USER);
   } else 
   {
-    $Line = mysql_fetch_assoc($Database->SQLCommand('SELECT * FROM user WHERE ID = '.$_SESSION['UserID']));    
+    $Line = mysql_fetch_assoc($Database->SQLCommand('SELECT * FROM `User` WHERE `ID` = '.$_SESSION['UserID']));    
     echo('<form action="Options.php" method="post">
   <fieldset><legend>Nastavení uživatele</legend>
@@ -86 +85 @@
     {
       echo('<option value="'.$LineTeam['Id'].'"'); 
-      if ($LineTeam['Id'] == $Line['team']) echo(' selected="selected"');
+      if ($LineTeam['Id'] == $Line['Team']) echo(' selected="selected"');
         echo('>'.$LineTeam['Name'].'</option>');
     }    

trunk/TranslationList.php

@@ -8 +8 @@
  
   // Get total item count
-  $DbResult = $Database->SQLCommand('SELECT COUNT(*) FROM ('.$Query.') AS T');
+  $DbResult = $Database->SQLCommand('SELECT COUNT(*) FROM ('.$Query.') AS `T`');
   $DbRow = mysql_fetch_row($DbResult);
   $PageList = GetPageList($DbRow[0]);    
@@ -16 +16 @@
   $TableColumns = array(
     array('Name' => 'ID', 'Title' => 'Pořadové číslo'), 
-    array('Name' => 'entry', 'Title' => 'Identifikační číslo'), 
+    array('Name' => 'Entry', 'Title' => 'Identifikační číslo'), 
     array('Name' => $TranslationTree[$GroupId]['Items'][0]['Column'], 'Title' => 'Název'), 
     array('Name' => 'VersionStart', 'Title' => 'Verze'), 
@@ -31 +31 @@
   while($Line = mysql_fetch_assoc($DbResult)) 
   {
-    echo('<tr><td><a href="form.php?group='.$GroupId.'&amp;ID='.$Line['ID'].'">'.$Line['ID'].'</a></td><td>'.$Line['entry'].'</td>'.
+    echo('<tr><td><a href="form.php?group='.$GroupId.'&amp;ID='.$Line['ID'].'">'.$Line['ID'].'</a></td><td>'.$Line['Entry'].'</td>'.
       '<td>'.htmlspecialchars($Line[$TranslationTree[$GroupId]['Items'][0]['Column']]).'</td>'.
       '<td>'.GetVersionWOW($Line['VersionStart']).'-'.GetVersionWOW($Line['VersionEnd']).'</td>');
@@ -51 +51 @@
   '<strong>Vypsání nepřeložených textů s limitem na stránku</strong><br /><br />');
 
-  WriteQuests('SELECT * FROM `'.$Table.'` AS `items` WHERE (`items`.`Language` = 0) AND NOT EXISTS(SELECT 1 FROM `'.$Table.'` AS `sub` WHERE (`sub`.`Language` <> 0) AND (`sub`.`entry` = `items`.`entry`) AND (`sub`.`Complete`=1) AND (`sub`.`VersionStart` = `items`.`VersionStart`) AND (`sub`.`VersionEnd` = `items`.`VersionEnd`))');
+  WriteQuests('SELECT * FROM `'.$Table.'` AS `items` WHERE (`items`.`Language` = 0) AND NOT EXISTS(SELECT 1 FROM `'.$Table.'` AS `sub` WHERE (`sub`.`Language` <> 0) AND (`sub`.`Entry` = `items`.`Entry`) AND (`sub`.`Complete`=1) AND (`sub`.`VersionStart` = `items`.`VersionStart`) AND (`sub`.`VersionEnd` = `items`.`VersionEnd`))');
 }
 
@@ -60 +60 @@
   if(array_key_exists('connexion_id', $_GET)) $_SESSION['connexion_id'] = $_GET['connexion_id'];
 
- //SELECT * FROM spell WHERE entry IN(SELECT entry FROM connexion_item WHERE connexion = 1)
   $Line = mysql_fetch_assoc($Database->SQLCommand('SELECT `Name` FROM `connexion` WHERE `Id` = '.$_SESSION['connexion_id']));
     echo('<a title="Zobrazit texty podle vlastního filtru" href="?group='.$GroupId.'&amp;action=filter">Filtr textů</a> ->
@@ -66 +65 @@
         <strong>Vypsání souvislostí ze skupiny '.$Line['Name'].'</strong><br /><br />');
 
-   WriteQuests('SELECT *, (SELECT `sub`.`User` FROM `'.$Table.'` AS `sub` WHERE (`sub`.`entry` = `'.$Table.'`.`entry`) AND (`Language` <> 0) LIMIT 1) AS `UserID`, (SELECT `user`.`user` FROM `user` WHERE `user`.`id` = `UserID`) AS `UserName` FROM `'.$Table.'` WHERE (`Language` = 0) AND (`entry` IN(SELECT `entry` FROM `connexion_item` WHERE `connexion` = '.$_SESSION['connexion_id'].') AND `VersionEnd` = "'.$BuildNumber_max.'" AND `VersionEnd` = "'.$BuildNumber_max.'"');
+   WriteQuests('SELECT *, (SELECT `sub`.`User` FROM `'.$Table.'` AS `sub` WHERE (`sub`.`Entry` = `'.$Table.'`.`Entry`) AND (`Language` <> 0) LIMIT 1) AS `UserID`, (SELECT `User`.`Name` FROM `User` WHERE `User`.`ID` = `UserID`) AS `UserName` FROM `'.$Table.'` WHERE (`Language` = 0) AND (`Entry` IN(SELECT `Entry` FROM `connexion_item` WHERE `connexion` = '.$_SESSION['connexion_id'].') AND `VersionEnd` = "'.$BuildNumber_max.'" AND `VersionEnd` = "'.$BuildNumber_max.'"');
 }
 
@@ -73 +72 @@
   global $GroupId, $Table, $BuildNumber_max, $Database;
 
- //SELECT * FROM spell WHERE entry IN(SELECT entry FROM connexion_item WHERE connexion = 1)
   echo('<a title="Zobrazit texty podle vlastního filtru" href="?group='.$GroupId.'&amp;action=filter">Filtr textů</a> -> '.
     '<a title="Zde je seznam souvislostí" href="?group='.$GroupId.'&amp;action=connexion">Souvislosti</a> - > '.
@@ -79 +77 @@
   echo('<table class="BaseTable"><tr><th>Pořadové číslo</th><th>Název</th>');
   echo('</tr>');
-  $ID = $Database->SQLCommand('SELECT * FROM connexion WHERE `Group` = '.$GroupId);        
+  $ID = $Database->SQLCommand('SELECT * FROM `connexion` WHERE `Group` = '.$GroupId);        
   while($Line = mysql_fetch_assoc($ID)) 
   {
@@ -96 +94 @@
         <strong>Vypsání nedokončených textů s limitem na stránku</strong><br /><br />');
 
-  WriteQuests('SELECT `items`.*, `user`.`user` AS `UserName` FROM `'.$Table.'` AS `items` JOIN `user` ON `user`.`id` = `items`.`User` WHERE (`items`.`Language` = 0) AND
-    NOT EXISTS(SELECT 1 FROM `'.$Table.'` AS `sub` WHERE (`sub`.`Language` <> 0) AND (`sub`.`entry` = `items`.`entry`) AND (`sub`.`Complete` = 1) AND (`VersionEnd` = '.$BuildNumber_max.')) AND
-   EXISTS(SELECT 1 FROM `'.$Table.'` AS `sub2` WHERE (`sub2`.`Language` <> 0) AND (`sub2`.`entry` = `items`.`entry`) AND (`sub2`.`Complete` = 0) AND (`VersionEnd` = '.$BuildNumber_max.')) AND (`items`.`VersionEnd` = '.$BuildNumber_max.')');
+  WriteQuests('SELECT `items`.*, `User`.`Name` AS `UserName` FROM `'.$Table.'` AS `items` JOIN `User` ON `User`.`ID` = `items`.`User` WHERE (`items`.`Language` = 0) AND
+    NOT EXISTS(SELECT 1 FROM `'.$Table.'` AS `sub` WHERE (`sub`.`Language` <> 0) AND (`sub`.`Entry` = `items`.`Entry`) AND (`sub`.`Complete` = 1) AND (`VersionEnd` = '.$BuildNumber_max.')) AND
+   EXISTS(SELECT 1 FROM `'.$Table.'` AS `sub2` WHERE (`sub2`.`Language` <> 0) AND (`sub2`.`Entry` = `items`.`Entry`) AND (`sub2`.`Complete` = 0) AND (`VersionEnd` = '.$BuildNumber_max.')) AND (`items`.`VersionEnd` = '.$BuildNumber_max.')');
 }
 
@@ -108 +106 @@
      <a title="Přeložené texty, můžete zde hlasovat, nebo opravovat texty" href="?group='.$GroupId.'&amp;action=Translate">Přeložené texty</a><br /><br />');
       
-  WriteQuests('SELECT `'.$Table.'`.*, `user`.`user` AS `UserName` FROM `'.$Table.'` JOIN `user` ON `user`.`id` = `'.$Table.'`.`User` WHERE (`'.$Table.'`.`Language` <> 0) AND (`'.$Table.'`.`Complete` = 1)');
+  WriteQuests('SELECT `'.$Table.'`.*, `User`.`Name` AS `UserName` FROM `'.$Table.'` JOIN `User` ON `User`.`ID` = `'.$Table.'`.`User` WHERE (`'.$Table.'`.`Language` <> 0) AND (`'.$Table.'`.`Complete` = 1)');
 }
 
@@ -117 +115 @@
   echo('<a title="Zobrazit texty podle vlastního filtru" href="?group='.$GroupId.'&amp;action=filter">Filtr textů</a> ->
         <a title="Přeložené questy přilášeného uživatele" href="?group='.$GroupId.'&amp;action=my">Moje překlady</a><br /><br />');
-  WriteQuests('SELECT `'.$Table.'`.*, `user`.`user` AS `UserName` FROM `'.$Table.'` JOIN `user` ON `user`.`id` = `'.$Table.'`.`user` WHERE `'.$Table.'`.`user` = '.$_SESSION['UserID']);
+  WriteQuests('SELECT `'.$Table.'`.*, `User`.`Name` AS `UserName` FROM `'.$Table.'` JOIN `User` ON `User`.`id` = `'.$Table.'`.`User` WHERE `'.$Table.'`.`User` = '.$_SESSION['UserID']);
 }
 
@@ -126 +124 @@
   echo('<a title="Zobrazit texty podle vlastního filtru" href="?group='.$GroupId.'&amp;action=filter">Filtr textů</a> ->
     <a title="Nedokončené texty" href="?group='.$GroupId.'&amp;action=mydevelop">Rozepsané překlady</a><br /><br />');
-  WriteQuests('SELECT *, (SELECT `user`.`user` FROM `user` WHERE `user`.`id` = `'.$Table.'`.`user`) AS `UserName` FROM `'.$Table.'` WHERE `user` = '.$_SESSION['UserID'].' AND `Complete` = 0');
+  WriteQuests('SELECT *, (SELECT `User`.`Name` FROM `User` WHERE `User`.`ID` = `'.$Table.'`.`User`) AS `UserName` FROM `'.$Table.'` WHERE `User` = '.$_SESSION['UserID'].' AND `Complete` = 0');
 }
 
@@ -146 +144 @@
   if($WhereUsers == '') $WhereUsers = '0';  
   
-  WriteQuests('SELECT *, (SELECT `user`.`user` FROM `user` WHERE `user`.`id` = `'.$Table.'`.`user`) AS `UserName` FROM `'.$Table.'` WHERE '.$WhereUsers);
+  WriteQuests('SELECT *, (SELECT `User`.`Name` FROM `User` WHERE `User`.`ID` = `'.$Table.'`.`User`) AS `UserName` FROM `'.$Table.'` WHERE '.$WhereUsers);
 }
 
@@ -153 +151 @@
   global $Database, $Table, $GroupId, $TranslationTree;
   
-  $ID = $Database->SQLCommand('SELECT `user` FROM `user` WHERE `id` = '.$_GET['user']);
+  $ID = $Database->SQLCommand('SELECT `Name` FROM `User` WHERE `ID` = '.$_GET['user']);
   $Line = mysql_fetch_row($ID);
   echo('<a title="Zobrazit texty podle vlastního filtru" href="?group='.$GroupId.'&amp;action=filter">Filtr textů</a>'.
@@ -165 +163 @@
       if(array_key_exists('not', $_GET)) 
       {
-        $sql = 'SELECT COUNT(*) FROM `'.$Group['TablePrefix'].'` WHERE `Complete` = 0 AND `user`='.$_GET['user'];
+        $sql = 'SELECT COUNT(*) FROM `'.$Group['TablePrefix'].'` WHERE `Complete` = 0 AND `User`='.$_GET['user'];
         $ID = $Database->SQLCommand($sql);
         $Line = mysql_fetch_row($ID);
@@ -173 +171 @@
       } else 
       {
-        $sql = 'SELECT COUNT(*) FROM `'.$Group['TablePrefix'].'` WHERE `user`='.$_GET['user'];
+        $sql = 'SELECT COUNT(*) FROM `'.$Group['TablePrefix'].'` WHERE `User`='.$_GET['user'];
         $ID = $Database->SQLCommand($sql);
         $Line = mysql_fetch_row($ID);
@@ -223 +221 @@
   if(array_key_exists('user', $_GET))
   {
-    $ID = $Database->SQLCommand('SELECT `user` FROM `user` WHERE `id` = '.($_GET['user'] * 1));
+    $ID = $Database->SQLCommand('SELECT `Name` FROM `User` WHERE `ID` = '.($_GET['user'] * 1));
     if(mysql_num_rows($ID) > 0)
     {
@@ -230 +228 @@
         '<strong>Vypis překladů uživatele '.$Line[0].': </strong><br /><br />');
       if(array_key_exists('not', $_GET)) 
-        WriteQuests('SELECT *, (SELECT `user`.`user` FROM `user` WHERE `user`.`id` = `'.$Table.'`.`user`) AS `UserName` FROM `'.$Table.'` WHERE (`Complete` = 0) AND (`user` = '.$_GET['user'].')');
-      else WriteQuests('SELECT *, (SELECT `user`.`user` FROM `user` WHERE `user`.`id` = `'.$Table.'`.`user`) AS `UserName` FROM `'.$Table.'` WHERE `user` = '.$_GET['user']);
+        WriteQuests('SELECT *, (SELECT `User`.`Name` FROM `User` WHERE `User`.`ID` = `'.$Table.'`.`User`) AS `UserName` FROM `'.$Table.'` WHERE (`Complete` = 0) AND (`User` = '.$_GET['user'].')');
+      else WriteQuests('SELECT *, (SELECT `User`.`Name` FROM `User` WHERE `User`.`ID` = `'.$Table.'`.`User`) AS `UserName` FROM `'.$Table.'` WHERE `User` = '.$_GET['user']);
     } else echo('Nebyl nalezen uživatel se zadaným id');
   } else echo('Je nutno zadat id uživatele.');
@@ -244 +242 @@
   else ErrorMessage('Nebyl zadán text k vyhledání.');
   
-  $sql = 'SELECT *, (SELECT `user`.`user` FROM `user` WHERE `user`.`id` = `'.$Table.'`.`user`) AS `UserName` FROM `'.$Table.'` WHERE `ID` LIKE "%'.$Search.'%"
-    OR `entry` LIKE "%'.$Search.'%"
+  $sql = 'SELECT *, (SELECT `User`.`Name` FROM `User` WHERE `User`.`ID` = `'.$Table.'`.`User`) AS `UserName` FROM `'.$Table.'` WHERE `ID` LIKE "%'.$Search.'%"
+    OR `Entry` LIKE "%'.$Search.'%"
     OR `Language` LIKE "%'.$Search.'%"
     OR `User` LIKE "%'.$Search.'%"
@@ -265 +263 @@
   else $Search = '';
  
-  $sql = 'SELECT *, (SELECT `user`.`user` FROM `user` WHERE `user`.`id` = `'.$Table.'`.`user`) AS `UserName` FROM `'.$Table.'` WHERE `entry` LIKE "'.$Search.'"';
+  $sql = 'SELECT *, (SELECT `User`.`Name` FROM `User` WHERE `User`.`ID` = `'.$Table.'`.`User`) AS `UserName` FROM `'.$Table.'` WHERE `Entry` LIKE "'.$Search.'"';
     
   WriteQuests($sql);
@@ -278 +276 @@
         <strong>Výpis všech textů s limitem na stránku</strong><br /><br />');
 
-  WriteQuests('SELECT * FROM `'.$Table.'` AS `items` WHERE (`items`.`Language` = 0)');
+  WriteQuests('SELECT *, (SELECT `User`.`Name` FROM `User` WHERE `User`.`ID` = `'.$Table.'`.`User`) AS `UserName` FROM `'.$Table.'` WHERE (`'.$Table.'`.`Language` = 0)');
 }
 
@@ -307 +305 @@
     '<select name="users[]" size="10" multiple="multiple" class="UserList">');
         
-  $ID = $Database->SQLCommand('SELECT `user`, `ID` FROM `user` WHERE
-    EXISTS(SELECT 1 FROM `'.$Table.'` WHERE `user` = `user`.`ID`) ORDER BY `user`');
+  $ID = $Database->SQLCommand('SELECT `Name`, `ID` FROM `User` WHERE
+    EXISTS(SELECT 1 FROM `'.$Table.'` WHERE `User` = `User`.`ID`) ORDER BY `Name`');
   if($ID)
   while($Line = mysql_fetch_assoc($ID))
-    echo('<option value="'.$Line['ID'].'">'.$Line['user'].'</option>');
+    echo('<option value="'.$Line['ID'].'">'.$Line['Name'].'</option>');
   
   echo('</select><br />
@@ -331 +329 @@
                                                 
   echo('</table>');
-  //  WriteQuests("SELECT * FROM quests Where user = ".$_SESSION['UserID']." AND Complete = '0'", '', 'mydevelop');
 }
 

trunk/action.php

@@ -15 +15 @@
     $Table = $Group['TablePrefix'];
   
-    $sql = 'SELECT count(*) FROM `'.$Table.'` WHERE `ID` LIKE "%'.$Search.'%"
-      OR `entry` LIKE "%'.$Search.'%"
+    $sql = 'SELECT COUNT(*) FROM `'.$Table.'` WHERE `ID` LIKE "%'.$Search.'%"
+      OR `Entry` LIKE "%'.$Search.'%"
       OR `User` LIKE "%'.$Search.'%"
       OR `Complete` LIKE "%'.$Search.'%"';
@@ -27 +27 @@
   }
   
-    $Line = mysql_fetch_row($Database->SQLCommand('SELECT count(*) FROM `user` WHERE `user` LIKE "%'.$Search.'%"'));
+    $Line = mysql_fetch_row($Database->SQLCommand('SELECT count(*) FROM `User` WHERE `User` LIKE "%'.$Search.'%"'));
   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.'%"'));
@@ -34 +34 @@
   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'));
+    $Line = mysql_fetch_row($Database->SQLCommand('SELECT count(*) FROM `Dictionary` WHERE (`Text` LIKE "%'.$Search.'%" OR `Description` LIKE "%'.$Search.'%") AND `Language` = 0'));
   echo('<tr><td><a href="dictionary.php?search='.$Search.'">Slovníček</a></td><td>'.$Line[0].'</td></tr>');
   
   echo('</table>');
 }
-
 
 function DatabaseKit()
@@ -62 +61 @@
     if(array_key_exists('Type',$_POST)) 
     {
-      $sql = 'DELETE FROM log WHERE Type = '.$_POST['Type'];
+      $sql = 'DELETE FROM `Log` WHERE `Type` = '.$_POST['Type'];
       $Database->SQLCommand($sql);
       WriteLog('Vymazán log '.$_POST['Type'], LOG_TYPE_MODERATOR);
@@ -79 +78 @@
         echo($Table.' ');
     
-        $sql = 'SELECT * FROM '.$Table.' WHERE (Language <> 0) AND (';
+        $sql = 'SELECT * FROM '.$Table.' WHERE (`Language` <> 0) AND (';
         foreach($Group['Items'] as $Item) 
         {
@@ -97 +96 @@
           }
           $sql = substr($sql,0,strlen($sql)-1);
-          $sql .= ' WHERE ID = '.$Line['ID'];
+          $sql .= ' WHERE `ID` = '.$Line['ID'];
           $Database->SQLCommand($sql);
           echo ('.');
@@ -121 +120 @@
         echo($Table.' ');
     
-        $sql = 'SELECT ID,entry as entry_tran, Take,
-     (SELECT ID FROM '.$Table.' WHERE Language = 0 AND entry = entry_tran LIMIT 1) as ID_orig
-      FROM '.$Table.' as tran WHERE (Language <> 0) AND ((Take = 0) OR (ID = Take) OR NOT EXISTS(SELECT 1 FROM '.$Table.' WHERE ID = tran.Take))';
+        $sql = 'SELECT `ID`, `Entry` AS EntryTran, `Take`,
+     (SELECT `ID` FROM `'.$Table.'` WHERE `Language = 0 AND `Entry` = `EntryTran` LIMIT 1) AS `IDOrig`
+      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)) 
         {
-          $sql = 'UPDATE '.$Table.' SET Take = '.$Line['ID_orig'].' WHERE ID = '.$Line['ID'];
+          $sql = 'UPDATE `'.$Table.'` SET `Take` = '.$Line['IDOrig'].' WHERE `ID` = '.$Line['ID'];
           $Database->SQLCommand($sql);
           echo('.');
@@ -151 +150 @@
       {      
         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';     
+        $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)) 
         {
-          $sql = 'UPDATE '.$Table.' SET ShortCut = '.$Line['ShortCut_orig'].' WHERE ID = '.$Line['ID'];
+          $sql = 'UPDATE `'.$Table.'` SET `ShortCut` = '.$Line['ShortCut_orig'].' WHERE `ID` = '.$Line['ID'];
           $Database->SQLCommand($sql);
           echo ('.');
@@ -178 +177 @@
   {
     $TextID = $_GET['ID'];       
-    $Database->SQLCommand('DELETE FROM '.$Table.' WHERE ID = '.$TextID.' AND Language <> 0');
+    $Database->SQLCommand('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);
@@ -205 +204 @@
   else die('Pro vkládaní musíte byt registrováni!');
     $text = $_POST['text'];
-    $Database->SQLCommand('INSERT INTO `shoutbox` ( `user` , `text` , `date` , `IP` ) 
+    $Database->SQLCommand('INSERT INTO `ShoutBox` ( `User` , `Text` , `Date` , `IP` ) 
     VALUES ("'.$user.'", "'.$text.'", NOW(), "'.$_SERVER['REMOTE_ADDR'].'")');
     echo('Zpráva vložena!<br>Budete přesměrováni...');   
@@ -219 +218 @@
   global $Database;
   
-  $DbResult = $Database->SQLCommand('SELECT COUNT(*) FROM `shoutbox`');
+  $DbResult = $Database->SQLCommand('SELECT COUNT(*) FROM `ShoutBox`');
   $DbRow = mysql_fetch_row($DbResult);
   $PageList = GetPageList($DbRow[0]);    
@@ -227 +226 @@
   if(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']);
+  $ID = $Database->SQLCommand('SELECT * FROM `ShoutBox` ORDER BY `ID` DESC '.$PageList['SQLLimit']);
   while($Line = mysql_fetch_assoc($ID))
-    echo('<div><strong>'.$Line['user'].'</strong>: '.htmlspecialchars($Line['text']).'</div>');
+    echo('<div><strong>'.$Line['User'].'</strong>: '.htmlspecialchars($Line['Text']).'</div>');
   echo('</div>');
   echo($PageList['Output']); 
@@ -238 +237 @@
   global $Database;
   
-  $DbResult = $Database->SQLCommand('SELECT COUNT(*) FROM `news`');
+  $DbResult = $Database->SQLCommand('SELECT COUNT(*) FROM `News`');
   $DbRow = mysql_fetch_row($DbResult);
   $PageList = GetPageList($DbRow[0]);    
@@ -246 +245 @@
   if(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`.`user` FROM `news` JOIN `user` ON `user`.`ID`=`news`.`user` ORDER BY `news`.`time` DESC '.$PageList['SQLLimit']);
+  $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))
-    echo('<div><strong>'.HumanDate($Line['time']).'</strong> '.$Line['text'].' ('.$Line['user'].')</div>');
+    echo('<div><strong>'.HumanDate($Line['Time']).'</strong> '.$Line['Text'].' ('.$Line['User'].')</div>');
   echo('</div>');
   echo($PageList['Output']); 

trunk/admin.php

@@ -44 +44 @@
   if(array_key_exists('text', $_POST)) 
   {
-    $querty = 'INSERT INTO `news` ( `Time` ,`User` ,`Text`) VALUES ( NOW( ) , '.$_SESSION['UserID'].', "'.$_POST['text'].'")';
+    $querty = 'INSERT INTO `News` ( `Time` ,`User` ,`Text`) VALUES ( NOW( ) , '.$_SESSION['UserID'].', "'.$_POST['text'].'")';
     $Database->SQLCommand($querty);
     echo('Aktualita uložena!');
@@ -55 +55 @@
   global $Database;
   
-  $DbResult = $Database->SQLCommand('SELECT COUNT(*) FROM `user`');
+  $DbResult = $Database->SQLCommand('SELECT COUNT(*) FROM `User`');
   $DbRow2 = mysql_fetch_row($DbResult);
 
@@ -61 +61 @@
     ' AND (`ID` != 128)'. // Skip user Neznámý
     ' AND (`LastLogin` < DATE_SUB(NOW(), INTERVAL 3 MONTH))'. // Time limit
-    ' AND (NOT EXISTS (SELECT `Id` FROM `Export` WHERE `user`.`ID` = `Export`.`User`))'. // Without exports
-    ' AND (NOT EXISTS (SELECT `ID` FROM `dictionary` WHERE `user`.`ID` = `dictionary`.`user`))'. // Without dictionary words
-    ' AND (NOT EXISTS (SELECT `Id` FROM `news` WHERE `user`.`ID` = `news`.`user`))'. // Without news
-    ' AND (NOT EXISTS (SELECT `ID` FROM `shoutbox` WHERE `user`.`user` = `shoutbox`.`user`))'. // Without shoutbox messages
+    ' AND (NOT EXISTS (SELECT `Id` FROM `Export` WHERE `User`.`ID` = `Export`.`User`))'. // Without exports
+    ' AND (NOT EXISTS (SELECT `ID` FROM `Dictionary` WHERE `User`.`ID` = `Dictionary`.`User`))'. // Without dictionary words
+    ' AND (NOT EXISTS (SELECT `Id` FROM `News` WHERE `User`.`ID` = `News`.`User`))'. // Without news
+    ' AND (NOT EXISTS (SELECT `ID` FROM `ShoutBox` WHERE `User`.`User` = `ShoutBox`.`User`))'. // Without shoutbox messages
     '';
-  $DbResult = $Database->SQLCommand('SELECT COUNT(*) FROM `user`'.$Condition);
+  $DbResult = $Database->SQLCommand('SELECT COUNT(*) FROM `User`'.$Condition);
   $DbRow = mysql_fetch_row($DbResult);
-  $Database->SQLCommand('DELETE FROM `user`'.$Condition);
+  $Database->SQLCommand('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`');
+  $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)');
+  $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)');
+  $Database->SQLCommand('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/>');     
       
@@ -82 +82 @@
   $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`))');
+  $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`))');
+  $Database->SQLCommand('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/>');     
 
@@ -90 +90 @@
   $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');
+  $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');
+  $Database->SQLCommand('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);');
+  $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`);');
   
   WriteLog('Smazány staré uživatelské účty', LOG_TYPE_ADMINISTRATION);
@@ -105 +105 @@
   global $Database;
   
-  $DbResult = $Database->SQLCommand('SELECT COUNT(*) FROM `log` WHERE `type`='.LOG_TYPE_ERROR);
+  $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);
+  $Database->SQLCommand('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)');
+$ID = $Database->SQLCommand('SELECT * FROM `Banner` WHERE `Show`=1 AND `DateLast` > (NOW() - INTERVAL 3 MONTH)');
   
 echo('<br/><strong>Servery odkazující na nás:</strong> <br />

trunk/banners/banner.php

@@ -16 +16 @@
     {
       $Referer = 'http://'.$HostName.'/';
-      $DbResult = $System->Database->query('SELECT * FROM `banner` WHERE `Web` = "'.$Referer.'"');
+      $DbResult = $System->Database->query('SELECT * FROM `Banner` WHERE `Web` = "'.$Referer.'"');
       if($DbResult->num_rows > 0)
-      $System->Database->query('UPDATE `banner` SET `DateLast` = NOW(), `LastURL` = "'.addslashes($_SERVER['HTTP_REFERER']).'" WHERE `Web` = "'.$Referer.'"');
-        else $System->Database->query('INSERT INTO `banner` (`Web`, `DateFirst`, `DateLast`, `LastURL`) VALUES ("'.$Referer.'", NOW(), NOW( ), "'.addslashes($_SERVER['HTTP_REFERER']).'")');
+      $System->Database->query('UPDATE `Banner` SET `DateLast` = NOW(), `LastURL` = "'.addslashes($_SERVER['HTTP_REFERER']).'" WHERE `Web` = "'.$Referer.'"');
+        else $System->Database->query('INSERT INTO `Banner` (`Web`, `DateFirst`, `DateLast`, `LastURL`) VALUES ("'.$Referer.'", NOW(), NOW( ), "'.addslashes($_SERVER['HTTP_REFERER']).'")');
     }
 

trunk/comparison.php

@@ -72 +72 @@
   foreach($Line as $Index => $LineItem)
   {
-    $LineUser = mysql_fetch_array($Database->SQLCommand('SELECT * FROM user WHERE id = '.$LineItem['User']));
-    echo('<th>'.$LineUser['user'].'</th>');
+    $LineUser = mysql_fetch_array($Database->SQLCommand('SELECT * FROM `User` WHERE `ID` = '.$LineItem['User']));
+    echo('<th>'.$LineUser['Name'].'</th>');
   }
   echo('</tr>');

trunk/dictionary.php

@@ -93 +93 @@
   if(Licence(LICENCE_USER)) 
   {
-    $DbResult = $Database->SQLCommand('SELECT `Language` FROM `user` WHERE `ID`='.$_SESSION['UserID']);
+    $DbResult = $Database->SQLCommand('SELECT `Language` FROM `User` WHERE `ID`='.$_SESSION['UserID']);
     $User = mysql_fetch_assoc($DbResult);
     $_SESSION['language'] = $User['Language'];
@@ -144 +144 @@
       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');
+        $DbResult = $Database->SQLCommand('SELECT * FROM `Dictionary` WHERE `Text` = "'.$_POST['Original'].'" AND `Language`=0');
         if(mysql_num_rows($DbResult) > 0)
         {
@@ -151 +151 @@
         } else 
         {
-          $DbResult = $Database->SQLCommand('SELECT MAX(Entry) FROM dictionary');
+          $DbResult = $Database->SQLCommand('SELECT MAX(`Entry`) FROM `Dictionary`');
           $DbRow = mysql_fetch_row($DbResult);
           $Entry = $DbRow[0] + 1;
-          $Database->SQLCommand('INSERT INTO `dictionary` ( `Text` , `Entry` , `Description` , `User`, `Language` ) VALUES ("'.$_POST['Original'].'", "'.$Entry.'", "", 0, 0);');
+          $Database->SQLCommand('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='.$_SESSION['UserID']);
+        $DbResult = $Database->SQLCommand('SELECT `Id` FROM `Dictionary` WHERE `Entry` = '.$Entry.' AND `Language`='.$_SESSION['language'].' AND `User`='.$_SESSION['UserID']);
         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']);
+          $Database->SQLCommand('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'].'", '.$_SESSION['UserID'].', '.$_SESSION['language'].')');
+          $Database->SQLCommand('INSERT INTO `Dictionary` ( `Text` , `Entry` , `Description` , `User`, `Language` ) VALUES ("'.$_POST['Translated'].'", "'.$Entry.'", "'.$_POST['Description'].'", '.$_SESSION['UserID'].', '.$_SESSION['language'].')');
         echo('Záznam byl uložen!');
       } else echo('Nebyly zaslány všechny položky formuláře.');
@@ -169 +169 @@
     if(($_GET['action'] == 'remove') and Licence(LICENCE_USER))
     {
-      $Database->SQLCommand('DELETE FROM dictionary WHERE User='.$_SESSION['UserID'].' AND Language='.$_SESSION['language'].' AND Entry='.$_GET['entry']);
+      $Database->SQLCommand('DELETE FROM `Dictionary` WHERE `User`='.$_SESSION['UserID'].' AND `Language`='.$_SESSION['language'].' AND `Entry`='.$_GET['entry']);
     } else
     if(($_GET['action'] == 'modify')  and Licence(LICENCE_USER))
     {
-      $DbResult = $Database->SQLCommand('SELECT * FROM dictionary WHERE User='.$_SESSION['UserID'].' AND Entry='.$_GET['entry'].' AND Language='.$_SESSION['language']);
+      $DbResult = $Database->SQLCommand('SELECT * FROM `Dictionary` WHERE `User`='.$_SESSION['UserID'].' 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');
+      $DbResult = $Database->SQLCommand('SELECT * FROM `Dictionary` WHERE `User`=0 AND `Entry`='.$_GET['entry'].' AND `Language`=0');
       $DbRow2 = mysql_fetch_assoc($DbResult);
       echo('<form action="dictionary.php?action=save" method="post">'.
@@ -216 +216 @@
   if($Search <> '') 
   {
-    $sql = 'SELECT `user`.`user` AS `UserName`, `user`. `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'].' WHERE LOWER(T1.Text) LIKE LOWER("%'.$Search.'%") OR LOWER(T1.Description) LIKE LOWER("%'.$Search.'%") ) AS T3 JOIN `user` ON `user`.`ID` = `T3`.`User` WHERE `T3`.`Language` = 0';
-  } else $sql = 'SELECT `user`.`user` 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');
+    $sql = 'SELECT `User`.`Name` AS `UserName`, `User`. `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'].' WHERE LOWER(`T1`.`Text`) LIKE LOWER("%'.$Search.'%") OR LOWER(`T1`.`Description`) LIKE LOWER("%'.$Search.'%") ) AS `T3` JOIN `User` ON `User`.`ID` = `T3`.`User` WHERE `T3`.`Language` = 0';
+  } 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);
   $PageList = GetPageList($DbRow[0]);  

trunk/download.php

@@ -13 +13 @@
   $Group = $TranslationTree[$TableID];
 
-  $ID = mysql_fetch_row($Database->SQLCommand('SELECT count(distinct(entry)) FROM '.$Group['TablePrefix'].' WHERE (Language <> 0) AND (Complete = 1) AND User IN('.$Users.')'));
+  $ID = mysql_fetch_row($Database->SQLCommand('SELECT COUNT(DISTINCT(`Entry`)) FROM '.$Group['TablePrefix'].' WHERE (`Language` <> 0) AND (`Complete` = 1) AND `User` IN('.$Users.')'));
   $NumberTranslate = $ID[0];
   
-  $ID = mysql_fetch_row($Database->SQLCommand('SELECT count(*) FROM '.$Group['TablePrefix'].' WHERE (Language = 0)'));
+  $ID = mysql_fetch_row($Database->SQLCommand('SELECT count(*) FROM `'.$Group['TablePrefix'].'` WHERE (`Language` = 0)'));
   $NumberAJ = $ID[0];
 
@@ -28 +28 @@
 }
 
-  if (array_key_exists('createverse', $_GET) and Licence(LICENCE_ADMIN)) {
+  /*
+   if (array_key_exists('createverse', $_GET) and Licence(LICENCE_ADMIN)) {
     if (array_key_exists('verse', $_POST)) { //ukládání
-        $Database->SQLCommand('INSERT INTO `verseclient` (`verse` ,`date` ,`text` ,`user`)
+        $Database->SQLCommand('INSERT INTO `verseclient` (`verse` ,`date` ,`text` ,`User`)
                   VALUES ( "'.$_POST['verse'].'", NOW( ) , "'.$_POST['text'].'", "'.$_SESSION['UserID'].'");');
       WriteLog('Nová verze ('.$_POST['verse'].') češtiny pro clienta uložena.', LOG_TYPE_MODERATOR);
@@ -37 +38 @@
       'Verze: <input type="text" name="verse" /> <input type="submit" value="Uložit" /><br />'.
       'Popis: <textarea rows="20" cols="60" name="text">');
-      $Line = mysql_fetch_assoc($Database->SQLCommand('SELECT ExportSetting FROM user Where ID = '.$_SESSION['UserID']));
+      $Line = mysql_fetch_assoc($Database->SQLCommand('SELECT `ExportSetting` FROM `User` WHERE `ID` = '.$_SESSION['UserID']));
       $ExportSetting = unserialize($Line['ExportSetting']);     
        
@@ -44 +45 @@
       foreach($ExportSetting['groups'] as $Index) $Tables .= GetPercentOfTable($Index,implode(',', $ExportSetting['users-selection']));
       
-      $ID = $Database->SQLCommand('SELECT user FROM user WHERE ID IN('.implode(',', $ExportSetting['users-selection']).')'); 
+      $ID = $Database->SQLCommand('SELECT `Name` FROM `User` WHERE `ID` IN('.implode(',', $ExportSetting['users-selection']).')'); 
       $Users = 'Vyexportovány překlady od uživatelů: ( '; 
-      while($Line = mysql_fetch_assoc($ID)) $Users .= $Line['user'].', '; $Users .= ' )';
+      while($User = mysql_fetch_assoc($ID)) $Users .= $User['Name'].', '; $Users .= ' )';
       //Výpis
       echo ('
@@ -55 +56 @@
     }
   }
+  */
 
 if(array_key_exists('addon', $_GET)) 
@@ -60 +62 @@
   echo('<br />Stažený soubor pouze rozbalte a zkopírujte do kořenové složky wow (C:\Program Files\World Of Warcraft\). Hru spouštějte přes soubor WoWME.exe <br /><br />'.
   '<table  class="BaseTable"><tr><th>Verze/datum</th><th>Popis</th></tr>');
-  $ID = $Database->SQLCommand('SELECT * FROM verseclient ORDER BY DATE DESC');
+  $ID = $Database->SQLCommand('SELECT * FROM `verseclient` ORDER BY `Date` DESC');
   while($Line = mysql_fetch_assoc($ID)) 
   {

trunk/export/export.php

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

trunk/export/index.php

@@ -42 +42 @@
   echo($Order['Output']);
 
-  $DbResult = $Database->SQLCommand('SELECT `user`.`user` AS `UserName`, `Export`.*, (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']);
+  $DbResult = $Database->SQLCommand('SELECT `User`.`Name` AS `UserName`, `Export`.*, (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))
   {
@@ -178 +178 @@
     else $InitialOrder = '';
 
-  $Query = 'SELECT (@I := @I + 1) AS Sequence2, TT.* FROM (SELECT ExportUser.Sequence, T.ID, T.TranslatedCount, T.user, T.XP FROM (SELECT user.ID, user.user, user.XP, TranslatedCount FROM `user`) AS T';
-  $Query .=' LEFT JOIN ExportUser ON ExportUser.Export = '.$_GET['ExportId'].' AND ExportUser.User=T.ID';
-  $Query .=' WHERE T.TranslatedCount > 0 ORDER BY COALESCE(ExportUser.Sequence, 100000000)'.$InitialOrder.') AS TT';
-
-  $DbResult = $Database->SQLCommand('SELECT COUNT(*) FROM ('.$Query.') AS X');
+  $Query = 'SELECT (@I := @I + 1) AS `Sequence2`, `TT`.* FROM (SELECT `ExportUser`.`Sequence`, `T`.`ID`, `T`.`TranslatedCount`, `T`.`Name`, `T`.`XP` FROM (SELECT `User`.`ID`, `User`.`Name`, `User`.`XP`, `TranslatedCount` FROM `User`) AS T';
+  $Query .=' LEFT JOIN `ExportUser` ON `ExportUser`.`Export` = '.$_GET['ExportId'].' AND `ExportUser`.`User`=`T`.`ID`';
+  $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);
   $PageList = GetPageList($DbRow[0]);    
@@ -210 +210 @@
     $Sequence = '<input type="text" name="seq'.$User['ID'].'" style="text-align: center; width: 40px;" value="'.$User['Sequence2'].'"'.$DisabledInput[$Editable].'/>';
     echo('<tr>
-    <td><a href="'.$Config['Web']['BaseURL'].'/TranslationList.php?user='.$User['ID'].'&amp;action=userall" title="Zobrazit všechny jeho přeložené texty">'.$User['user'].'</a></td>
+    <td><a href="'.$Config['Web']['BaseURL'].'/TranslationList.php?user='.$User['ID'].'&amp;action=userall" title="Zobrazit všechny jeho přeložené texty">'.$User['Name'].'</a></td>
     <td>'.$User['TranslatedCount'].'</td>
-      <td><img src="'.$Config['Web']['TempFolder'].'/user/'.$User['user'].'/level.png" alt="Úroveň uživatele" /></td>
+      <td><img src="'.$Config['Web']['TempFolder'].'/user/'.$User['Name'].'/level.png" alt="Úroveň uživatele" /></td>
     <td>'.$Selection.'</td><td>'.$Sequence.'</td></tr>');
   }
@@ -269 +269 @@
   if(array_key_exists('ExportId', $_GET))
   {
-    $DbRows = $Database->SQLCommand('SELECT * FROM Export WHERE Id='.$_GET['ExportId']);
+    $DbRows = $Database->SQLCommand('SELECT * FROM `Export` WHERE `Id`='.$_GET['ExportId']);
     if(mysql_num_rows($DbRows) > 0)
     {    
@@ -289 +289 @@
           if(array_key_exists('sel'.$LanguageId, $_POST)) $Selected = true; 
             else $Selected = false;
-          $Condition = ' WHERE Export='.$_GET['ExportId'].' AND Language='.$LanguageId;
-          $DbResult = $Database->SQLCommand('SELECT * FROM ExportLanguage '.$Condition);
+          $Condition = ' WHERE Export='.$_GET['ExportId'].' AND `Language`='.$LanguageId;
+          $DbResult = $Database->SQLCommand('SELECT * FROM `ExportLanguage` '.$Condition);
           if(mysql_num_rows($DbResult) > 0)
           {
-            if(!$Selected) $Database->SQLCommand('DELETE FROM ExportLanguage '.$Condition);
-              else $Database->SQLCommand('UPDATE ExportLanguage SET Sequence='.$Value.$Condition);
+            if(!$Selected) $Database->SQLCommand('DELETE FROM `ExportLanguage` '.$Condition);
+              else $Database->SQLCommand('UPDATE `ExportLanguage` SET `Sequence`='.$Value.$Condition);
           } else
           {
-            if($Selected) $Database->SQLCommand('INSERT INTO ExportLanguage (Export, Language, Sequence) VALUES ('.$_GET['ExportId'].', '.$LanguageId.', '.$Value.')');
+            if($Selected) $Database->SQLCommand('INSERT INTO `ExportLanguage` (`Export`, `Language`, `Sequence`) VALUES ('.$_GET['ExportId'].', '.$LanguageId.', '.$Value.')');
           }         
         }
@@ -304 +304 @@
       // Recalculate sequence number
       $Database->SQLCommand('SET @I = 0');
-      $Database->SQLCommand('UPDATE ExportLanguage SET Sequence = (@I := @I + 1) WHERE Export='.$_GET['ExportId'].' ORDER BY Sequence;');
+      $Database->SQLCommand('UPDATE `ExportLanguage` SET `Sequence` = (@I := @I + 1) WHERE `Export`='.$_GET['ExportId'].' ORDER BY `Sequence`;');
     }
   }
 
-  $Query = 'SELECT (@I := @I + 1) AS Sequence2, Sequence, language.Id, Name FROM language';
-  $Query .=' LEFT JOIN ExportLanguage ON ExportLanguage.Export = '.$_GET['ExportId'].' AND ExportLanguage.Language=language.Id';
-  $Query .=' WHERE language.Enabled = 1 ORDER BY COALESCE(Sequence, 100)';
+  $Query = 'SELECT (@I := @I + 1) AS `Sequence2`, `Sequence`, `Language`.`Id`, `Name` FROM `Language`';
+  $Query .=' LEFT JOIN `ExportLanguage` ON `ExportLanguage`.`Export` = '.$_GET['ExportId'].' AND `ExportLanguage`.`Language`=`Language`.`Id`';
+  $Query .=' WHERE `Language`.`Enabled` = 1 ORDER BY COALESCE(`Sequence`, 100)';
 
   $DbResult = $Database->SQLCommand('SELECT COUNT(*) FROM ('.$Query.') AS X');
@@ -451 +451 @@
   if(array_key_exists('ExportId', $_GET))
   {
-    $DbRows = $Database->SQLCommand('SELECT * FROM Export WHERE Id='.$_GET['ExportId']);
+    $DbRows = $Database->SQLCommand('SELECT * FROM `Export` WHERE `Id`='.$_GET['ExportId']);
     if(mysql_num_rows($DbRows) > 0)
     {    
@@ -463 +463 @@
   }
 
-  $DbResult = $Database->SQLCommand('SELECT * FROM Export WHERE Id='.$_GET['ExportId']);
+  $DbResult = $Database->SQLCommand('SELECT * FROM `Export` WHERE `Id`='.$_GET['ExportId']);
   $Export = mysql_fetch_assoc($DbResult);
   
@@ -473 +473 @@
     '<br />');
   }
-  $DbResult = $Database->SQLCommand('SELECT * FROM ExportOutputType ORDER BY Name');
+  $DbResult = $Database->SQLCommand('SELECT * FROM `ExportOutputType` ORDER BY `Name`');
   while($ExportFormat = mysql_fetch_assoc($DbResult))
   {
@@ -490 +490 @@
   if(array_key_exists('ExportId', $_GET))
   {
-    $DbRows = $Database->SQLCommand('SELECT * FROM Export WHERE Id='.$_GET['ExportId']);
+    $DbRows = $Database->SQLCommand('SELECT * FROM `Export` WHERE `Id`='.$_GET['ExportId']);
     if(mysql_num_rows($DbRows) > 0)
     {    
@@ -499 +499 @@
   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']);
+    $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);
 
-  $Query = 'SELECT wow_client_version.* FROM ExportVersion LEFT JOIN wow_client_version ON wow_client_version.Id=ExportVersion.ClientVersion WHERE ExportType='.$Export['OutputType'];
-
-  $DbResult = $Database->SQLCommand('SELECT COUNT(*) FROM ('.$Query.') AS X');
+  $Query = 'SELECT `wow_client_version`.* FROM `ExportVersion` LEFT JOIN `wow_client_version` ON `wow_client_version`.`Id`=`ExportVersion`.`ClientVersion` WHERE `ExportType`='.$Export['OutputType'];
+
+  $DbResult = $Database->SQLCommand('SELECT COUNT(*) FROM ('.$Query.') AS `X`');
   $DbRow = mysql_fetch_row($DbResult);
   $PageList = GetPageList($DbRow[0]);    
@@ -532 +532 @@
   echo($Order['Output']);
 
-  $Query = 'SELECT * FROM ('.$Query.') AS TX '.$Order['SQL'].$PageList['SQLLimit'];
+  $Query = 'SELECT * FROM ('.$Query.') AS `TX` '.$Order['SQL'].$PageList['SQLLimit'];
   $DbResult = $Database->SQLCommand($Query);
   while($Version = mysql_fetch_assoc($DbResult))
@@ -551 +551 @@
   global $Database;
   
-  $DbResult = $Database->SQLCommand('SELECT * FROM Export WHERE Id='.$_GET['ExportId']);
+  $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']);
+  $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']);
+    $DbResult = $Database->SQLCommand('SELECT * FROM `ExportVersion` WHERE `ExportType`='.$Export[ 'OutputType'].' AND `ClientVersion`='.$Export['ClientVersion']);
     if(mysql_num_rows($DbResult) > 0)
     {  
@@ -569 +569 @@
   global $Database;
 
-  $DbResult = $Database->SQLCommand('SELECT * FROM Export WHERE Id='.$_GET['ExportId']);
+  $DbResult = $Database->SQLCommand('SELECT * FROM `Export` WHERE `Id`='.$_GET['ExportId']);
   $Export = mysql_fetch_assoc($DbResult);
-  $DbResult = $Database->SQLCommand('SELECT * FROM user WHERE ID='.$Export['User']);
+  $DbResult = $Database->SQLCommand('SELECT * FROM `User` WHERE `ID`='.$Export['User']);
   $User = mysql_fetch_assoc($DbResult);
-  echo('Export <strong><a href="?Action=View&amp;Tab=6&amp;ExportId='.$Export['Id'].'">'.$_GET['ExportId'].'</a></strong> překladatele <strong>'.$User['user'].'</strong> s označením <strong>'.$Export['Title'].'</strong>');
+  echo('Export <strong><a href="?Action=View&amp;Tab=6&amp;ExportId='.$Export['Id'].'">'.$_GET['ExportId'].'</a></strong> překladatele <strong>'.$User['Name'].'</strong> s označením <strong>'.$Export['Title'].'</strong>');
   ShowTabs(array('Obecné', 'Překladatelé', 'Překlady', 'Jazyky', 'Formát', 'Verze', 'Výstup'));
   echo('<div id="content">');

trunk/export/process_aowow_export.php

@@ -18 +18 @@
 // Rebuild user selection
 $UserSelection = array();
-$DbResult = $Database->SQLCommand('SELECT `ID`, `XP` FROM `user`');
+$DbResult = $Database->SQLCommand('SELECT `ID`, `XP` FROM `User`');
 while($DbRow = mysql_fetch_assoc($DbResult))
 {

trunk/form.php

@@ -17 +17 @@
   if(!$Line) die('Překlad nenalezen.');
     
-  $DbResult = $Database->SQLCommand('SELECT * FROM `'.$Table.'` WHERE `Language` = 0  AND `entry` = '.$Line['entry'].' AND `VersionEnd` = '.$Line['VersionEnd'].' LIMIT 1');
+  $DbResult = $Database->SQLCommand('SELECT * FROM `'.$Table.'` WHERE `Language` = 0  AND `Entry` = '.$Line['Entry'].' AND `VersionEnd` = '.$Line['VersionEnd'].' LIMIT 1');
   $LineAJ = mysql_fetch_assoc($DbResult);
   if(!$Line) die('Anglický originál k překladu nenalezen.');
   
   $User = @$_SESSION['User'];
-  $IDUser = $Database->SQLCommand('SELECT * FROM `user` WHERE `id` = '.$Line['User']);
+  $IDUser = $Database->SQLCommand('SELECT * FROM `User` WHERE `ID` = '.$Line['User']);
   $LineUser = mysql_fetch_array($IDUser);
   
   echo('Skupina: <strong>'.$TranslationTree[$GroupId]['Name'].'</strong><br />');
       
-  if(($Line['Language'] <> 0) and ($LineUser['user'] <> '')) 
-    echo('Přeložil: <strong>'.$LineUser['user'].'</strong> <br />');
+  if(($Line['Language'] <> 0) and ($LineUser['Name'] <> '')) 
+    echo('Přeložil: <strong>'.$LineUser['Name'].'</strong> <br />');
   if(($Line['Take'] <> 0) and ($Line['Take'] <> $Line['ID'])) 
   {
@@ -47 +47 @@
   echo('<br />');
    
-  $DbResult = $Database->SQLCommand('SELECT COUNT(*) FROM `'.$Table.'` WHERE `entry` = '.$Line['entry'].' AND `Language` <> 0');
+  $DbResult = $Database->SQLCommand('SELECT COUNT(*) FROM `'.$Table.'` WHERE `Entry` = '.$Line['Entry'].' AND `Language` <> 0');
   $Version = mysql_fetch_row($DbResult);
   $Version = $Version[0];
   if($Version > 0)
   {
-    echo('<form action="comparison.php" method="get"><a href="TranslationList.php?group='.$GroupId.'&amp;action=searchentry&amp;ID='.$Line['entry'].'">Počet verzí: <strong>'.$Version.'</strong></a>  
+    echo('<form action="comparison.php" method="get"><a href="TranslationList.php?group='.$GroupId.'&amp;action=searchentry&amp;ID='.$Line['Entry'].'">Počet verzí: <strong>'.$Version.'</strong></a>  
       <input type="hidden" name="group" value="'.$GroupId.'" />
-      <input type="hidden" name="entry" value="'.$Line['entry'].'" />
+      <input type="hidden" name="entry" value="'.$Line['Entry'].'" />
       <input type="hidden" name="ID2" value="'.$TextID.'" />
       <select onchange="this.form.submit();" name="ID1">
       <option value="-1">Vyberte text k porovnání</option>
       <option value="-1">Zobrazit/porovnat všechny</option>'); 
-    $DataID = $Database->SQLCommand('SELECT *, (SELECT `user`.`user` FROM `user` WHERE `user`.`id` = `'.$Table.'`.`user`) AS `User` FROM `'.$Table.'` WHERE (`entry` = '.$Line['entry'].') AND (`ID` <> '.$Line['ID'].')');  
+    $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'].')');  
     while($version = mysql_fetch_array($DataID))
     {     
@@ -65 +65 @@
       else 
       {
-        if($version['Language'] == 0) $version['User'] = 'Předloha';
-        echo('<option value="'.$version['ID'].'">'.$version['ID'].' - '.$Version['User'].' ('.GetVersionWOW($version['VersionStart']).' - '.GetVersionWOW($version['VersionEnd']).')</option>');
+        if($version['Language'] == 0) $version['UserName'] = 'Předloha';
+        echo('<option value="'.$version['ID'].'">'.$version['ID'].' - '.$Version['UserName'].' ('.GetVersionWOW($version['VersionStart']).' - '.GetVersionWOW($version['VersionEnd']).')</option>');
       }
     }
@@ -72 +72 @@
   } else
   {
-    echo('<a href="TranslationList.php?group='.$GroupId.'&amp;action=searchentry&amp;ID='.$Line['entry'].'">Počet verzí: <strong>'.$Version.'</strong></a>'); 
+    echo('<a href="TranslationList.php?group='.$GroupId.'&amp;action=searchentry&amp;ID='.$Line['Entry'].'">Počet verzí: <strong>'.$Version.'</strong></a>'); 
   }
 
@@ -87 +87 @@
 
   if($TranslationTree[$GroupId]['WowheadName'] != '')
-    $WowheadLink = '<a href="http://www.wowhead.com/?'.$TranslationTree[$GroupId]['WowheadName'].'='.$LineAJ['entry'].'">'.$LineAJ['entry'].'</a>';
-    else $WowheadLink = $LineAJ['entry'];
+    $WowheadLink = '<a href="http://www.wowhead.com/?'.$TranslationTree[$GroupId]['WowheadName'].'='.$LineAJ['Entry'].'">'.$LineAJ['Entry'].'</a>';
+    else $WowheadLink = $LineAJ['Entry'];
   
-  echo('<input type="hidden" name="entry" value="'.$LineAJ['entry'].'" />
+  echo('<input type="hidden" name="entry" value="'.$LineAJ['Entry'].'" />
     <input type="hidden" name="user" value="'.$User.'" />
     <input type="hidden" name="ID" value="'.$TextID.'" />
@@ -107 +107 @@
   else if($_SESSION['UserID'] != '')
   {
-    $IDUser = $Database->SQLCommand('SELECT * FROM `user` WHERE `id` = '.$_SESSION['UserID']);
+    $IDUser = $Database->SQLCommand('SELECT * FROM `User` WHERE `ID` = '.$_SESSION['UserID']);
     $LineUser = mysql_fetch_array($IDUser);
-    $Language = $LineUser['Language'];  //jiný user vyčítám
+    $Language = $LineUser['Language'];  // jiný user vyčítám
   } else $Language = 0;
   WriteLanguages($Language);

trunk/img_level.php

@@ -72 +72 @@
           else $groupby .= ', '.$TextItem['Column'];
       } 
-      $IDtran = $Database->SQLCommand('SELECT * FROM `'.$Group['TablePrefix'].'` WHERE User = '.$user_ID.' AND Complete = 1 '.$groupby);
+      $IDtran = $Database->SQLCommand('SELECT * FROM `'.$Group['TablePrefix'].'` WHERE `User` = '.$user_ID.' AND `Complete` = 1 '.$groupby);
       while($Line = mysql_fetch_array($IDtran)) 
       {   //jednotlivé překlady
@@ -106 +106 @@
 
   // Hlavní kod pro uživatele
-  $ID = $Database->SQLCommand('SELECT `ID`, `user` FROM `user` WHERE `NeedUpdate` = 1');
+  $ID = $Database->SQLCommand('SELECT `ID`, `Name` FROM `User` WHERE `NeedUpdate` = 1');
   while($LineUser = mysql_fetch_array($ID)) 
   {
@@ -120 +120 @@
     
     $xp = GetXPFromTranslation($LineUser['ID']); 
-    $Database->SQLCommand('UPDATE `user` SET `XP` = '.$xp.', `TranslatedCount` = '.$TranslatedCount.' WHERE `user`.`ID` = '.$LineUser['ID']);
-    CreateImg('user', $LineUser['user'], $xp);
+    $Database->SQLCommand('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)');
+  $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)) 
   {
-    CreateImg('team', $LineTeam['name'], substr($LineTeam['average'], 0, strpos($LineTeam['average'],'.')));  //vytváření obrázku
+    CreateImg('team', $LineTeam['Name'], substr($LineTeam['Average'], 0, strpos($LineTeam['Average'],'.')));  //vytváření obrázku
   }
-  $Database->SQLCommand('UPDATE `user` SET `NeedUpdate` = 0');
+  $Database->SQLCommand('UPDATE `User` SET `NeedUpdate` = 0');
 }
 
@@ -138 +138 @@
   
   // Do update for all users
-  $Database->SQLCommand('UPDATE `user` SET `NeedUpdate` = 1');
+  $Database->SQLCommand('UPDATE `User` SET `NeedUpdate` = 1');
   ImgLevelUpdate();
   
   echo('<strong>Uživatelé</strong><br/>');
-  $ID = $Database->SQLCommand('SELECT `ID`, `user` FROM `user`');
+  $ID = $Database->SQLCommand('SELECT `ID`, `Name` FROM `User`');
   while($LineUser = mysql_fetch_array($ID)) 
   {
-    echo('<img src="tmp/user/'.$LineUser['user'].'/level.png" /> '.$LineUser['user'].'<br />');
+    echo('<img src="tmp/user/'.$LineUser['Name'].'/level.png" /> '.$LineUser['Name'].'<br />');
   }
 
   echo('<br/><strong>Týmy</strong><br/>');
-  $ID = $Database->SQLCommand('SELECT ID, Name FROM Team');
+  $ID = $Database->SQLCommand('SELECT `ID`, `Name` FROM `Team`');
   while($LineTeam = mysql_fetch_array($ID)) 
   {

trunk/img_statistic.php

@@ -10 +10 @@
 if(array_key_exists('team', $_GET)) 
 {
-  $team = ' AND `User` IN (SELECT `ID` FROM `user` WHERE `team` = '.($_GET['team'] * 1).')';
+  $team = ' AND `User` IN (SELECT `ID` FROM `User` WHERE `Team` = '.($_GET['team'] * 1).')';
 } else $team = '';
 
@@ -24 +24 @@
 
 $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));
+$ID = mysql_fetch_row($Database->SQLCommand('SELECT COUNT(DISTINCT(`Entry`)) FROM `'.$Group['TablePrefix'].'` WHERE '.$where));
 $NumberTranslate = $ID[0];
   
-$ID = mysql_fetch_row($Database->SQLCommand('SELECT count(distinct(`entry`)) FROM `'.$Group['TablePrefix'].'` WHERE `VersionEnd` = '.$BuildNumber_max.' AND (`Language` = 0)'));
+$ID = mysql_fetch_row($Database->SQLCommand('SELECT COUNT(DISTINCT(`Entry`)) FROM `'.$Group['TablePrefix'].'` WHERE `VersionEnd` = '.$BuildNumber_max.' AND (`Language` = 0)'));
 $NumberAJ = $ID[0];
 
-$DbResult = $Database->SQLCommand('SELECT count(*) FROM `log` WHERE (`Type` = 1) AND (`date` >= CURRENT_DATE - INTERVAL '.$Days.' DAY) AND (`text` LIKE "%'.$Group['Name'].'%")');
+$DbResult = $Database->SQLCommand('SELECT COUNT(*) FROM `Log` WHERE (`Type` = 1) AND (`Date` >= CURRENT_DATE - INTERVAL '.$Days.' DAY) AND (`Text` LIKE "%'.$Group['Name'].'%")');
 $ID = mysql_fetch_row($DbResult);
 $NumberPerDay = $ID[0]; //date ("Y-m-d H:i:s")

trunk/import/import_dbc.php

@@ -5 +5 @@
 UPDATE `gametips` SET VersionStart = 8606,VersionEnd = 8606;
 UPDATE `spell` SET VersionStart = 8606,VersionEnd = 8606;
-DELETE FROM `log` WHERE Type = 11;
+DELETE FROM `Log` WHERE Type = 11;
 */  
  

trunk/includes/global.php

@@ -44 +44 @@
   if(Licence(LICENCE_USER)) echo(' <a href="'.$Config['Web']['BaseURL'].'action.php?action=shoutbox">Vložit</a>');
   echo('<div class="box"><table>');
-  $ID = $Database->SQLCommand('SELECT * FROM shoutbox ORDER BY ID DESC LIMIT 20');
+  $ID = $Database->SQLCommand('SELECT * FROM `ShoutBox` ORDER BY `ID` DESC LIMIT 20');
   while($Line = mysql_fetch_assoc($ID))
-    echo('<tr><td><strong>'.$Line['user'].'</strong>: '.htmlspecialchars($Line['text']).'</td></tr>');
+    echo('<tr><td><strong>'.$Line['User'].'</strong>: '.htmlspecialchars($Line['Text']).'</td></tr>');
   echo('</table></div>');
 }
@@ -58 +58 @@
   if(Licence(LICENCE_USER))
   {
-    $DbResult = $Database->SQLCommand('SELECT `team`, `user` FROM `user` WHERE ID='.$_SESSION['UserID']);
+    $DbResult = $Database->SQLCommand('SELECT `Team`, `Name` FROM `User` WHERE ID='.$_SESSION['UserID']);
     $User = mysql_fetch_assoc($DbResult);
-    $DbResult = $Database->SQLCommand('SELECT `Id`, `Name` FROM `Team` WHERE Id='.$User['team']);
+    $DbResult = $Database->SQLCommand('SELECT `Id`, `Name` FROM `Team` WHERE Id='.$User['Team']);
     $Team = mysql_fetch_assoc($DbResult);
 
     //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>');
-    echo('<span class="MenuItem2">'.$User['user'].' <a href="'.$Config['Web']['BaseURL'].'?Logout">Odhlášení</a> <a href="'.$Config['Web']['BaseURL'].'Options.php">Nastavení</a></span>');
+    echo('<span class="MenuItem2">'.$User['Name'].' <a href="'.$Config['Web']['BaseURL'].'?Logout">Odhlášení</a> <a href="'.$Config['Web']['BaseURL'].'Options.php">Nastavení</a></span>');
   } else 
   {
@@ -189 +189 @@
   
   echo('Online překladatelé:<br />');
-  $ID = $Database->SQLCommand('SELECT `user`, `GM`, `ID` FROM `user` WHERE `LastLogin` >= NOW() - 300 AND ((`LastLogout` < `LastLogin`) OR (ISNULL(`LastLogout`)))');
-  while ($Line = mysql_fetch_assoc($ID))
-  {
-    if(Licence(LICENCE_MODERATOR)) $Name = '<a href="user.php?user='.$Line['ID'].'">'.$Line['user'].'</a>';
-    else $Name = $Line['user'];
-    //if($Line['GM'] <> 0) $TextGM = '<small>('.$Moderators[$Line['GM']].')</small>';
-    //else 
+  $ID = $Database->SQLCommand('SELECT `Name`, `GM`, `ID` FROM `User` WHERE `LastLogin` >= NOW() - 300 AND ((`LastLogout` < `LastLogin`) OR (ISNULL(`LastLogout`)))');
+  while($User = mysql_fetch_assoc($ID))
+  {
+    if(Licence(LICENCE_MODERATOR)) $Name = '<a href="user.php?user='.$User['ID'].'">'.$User['Name'].'</a>';
+    else $Name = $User['Name'];
     $TextGM = '';
     echo('<strong>'.$Name.'</strong>'.$TextGM.'<br />');
@@ -215 +213 @@
     $_SESSION['Pass'] = $_POST['LoginPass'];
 
-    $DbResult = $Database->SQLCommand('SELECT * FROM `user` WHERE LOWER(`user`) = LOWER("'.$_SESSION['User'].'") AND `pass` = sha1(CONCAT(sha1("'.$_SESSION['Pass'].'"), `Salt`))');
+    $DbResult = $Database->SQLCommand('SELECT * FROM `User` WHERE LOWER(`Name`) = LOWER("'.$_SESSION['User'].'") AND `Pass` = sha1(CONCAT(sha1("'.$_SESSION['Pass'].'"), `Salt`))');
     if(mysql_num_rows($DbResult) == 0)
     {
@@ -226 +224 @@
       $User = mysql_fetch_assoc($DbResult);
       $_SESSION['UserID'] = $User['ID']; 
-      $_SESSION['User'] = $User['user'];
+      $_SESSION['User'] = $User['Name'];
       WriteLog('Login: '.$_SESSION['User'], LOG_TYPE_USER);
     }
@@ -236 +234 @@
     WriteLog('Odhlášení', LOG_TYPE_USER);
     if(is_numeric($_SESSION['UserID']))
-      $Database->SQLCommand('UPDATE `user` SET `LastLogout` = NOW() WHERE `ID` = '.$_SESSION['UserID']);
+      $Database->SQLCommand('UPDATE `User` SET `LastLogout` = NOW() WHERE `ID` = '.$_SESSION['UserID']);
     $_SESSION['User'] = '';
     $_SESSION['Pass'] = '';
@@ -244 +242 @@
   // Záznam o aktivitě
   if(Licence(LICENCE_USER) and array_key_exists('REMOTE_ADDR', $_SERVER)) 
-    $Database->SQLCommand('UPDATE `user` SET `LastIP` = "'.$_SERVER['REMOTE_ADDR'].'", `LastLogin` = NOW() WHERE `ID` = '.$_SESSION['UserID']);
+    $Database->SQLCommand('UPDATE `User` SET `LastIP` = "'.$_SERVER['REMOTE_ADDR'].'", `LastLogin` = NOW() WHERE `ID` = '.$_SESSION['UserID']);
 }
 

trunk/includes/global_function.php

@@ -223 +223 @@
     // $User = $_SESSION['User'];
     $Pass = $_SESSION['Pass'];
-    $Line = mysql_fetch_array($Database->SQLCommand('SELECT * FROM user WHERE ID = '.$_SESSION['UserID'].' AND GM >= '.$Licence.' AND pass = sha1(CONCAT(sha1("'.$Pass.'"), Salt))'));
+    $Line = mysql_fetch_array($Database->SQLCommand('SELECT * FROM `User` WHERE `ID` = '.$_SESSION['UserID'].' AND `GM` >= '.$Licence.' AND `Pass` = sha1(CONCAT(sha1("'.$Pass.'"), `Salt`))'));
     return($Line);
   } else 
@@ -245 +245 @@
   
   $Result = array();
-  $DbResult = $Database->SQLCommand('SELECT * FROM `language` WHERE `Enabled` = 1');
+  $DbResult = $Database->SQLCommand('SELECT * FROM `Language` WHERE `Enabled` = 1');
   while($DbRow = mysql_fetch_assoc($DbResult))
     $Result[$DbRow['Id']] = $DbRow;
@@ -288 +288 @@
 
   $Database->SelectDatabase($Config['Database']['Database']);    
-  $Query = 'INSERT INTO `log` ( `user` , `type` , `text` , `date` , `IP` )
+  $Query = 'INSERT INTO `Log` ( `User` , `Type` , `Text` , `Date` , `IP` )
    VALUES ('.$user.', '.$Type.', "'.addslashes($Text).'", NOW(), "'.$ip.'")';
   $Database->SQLCommand($Query);

trunk/index.php

@@ -8 +8 @@
 
   $Output = '<strong>Změny systému:</strong><div class="NewsBox">';
-  $DbResult = $Database->SQLCommand('SELECT news.Time, user.user, news.Text FROM news JOIN user ON user.ID = news.User ORDER BY Time DESC LIMIT 10');
+  $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))
-    $Output .= '<div><strong>'.$DbRow['user'].' ('.date('d.m.Y', MysqlDateTimeToTime($DbRow['Time'])).')</strong> <br />'.$DbRow['Text'].'</div>';  
+    $Output .= '<div><strong>'.$DbRow['Name'].' ('.date('d.m.Y', MysqlDateTimeToTime($DbRow['Time'])).')</strong> <br />'.$DbRow['Text'].'</div>';  
   $Output .= '<a href="action.php?action=news">Všechny zprávy</a>';
   $Output .= '</div>';
@@ -21 +21 @@
 
   $Output = '<br /><strong>Poslední překlady:</strong><div class="NewsBox">';
-  $DbResult = $Database->SQLCommand('SELECT date,user.user,text FROM log JOIN user ON user.ID = log.User WHERE type = 1 ORDER BY date DESC LIMIT 20');
+  $DbResult = $Database->SQLCommand('SELECT `Date`, `User`.`Name`, `Text` FROM `Log` JOIN `User` ON `User`.`ID` = `Log`.`User` WHERE `Type` = 1 ORDER BY `Date` DESC LIMIT 20');
   while($DbRow = mysql_fetch_assoc($DbResult))
-    $Output .= '<strong>'.$DbRow['user'].' ('.date('d.m.Y', MysqlDateTimeToTime($DbRow['date'])).')</strong>
-    '.$DbRow['text'].' <br />';  
+    $Output .= '<strong>'.$DbRow['Name'].' ('.date('d.m.Y', MysqlDateTimeToTime($DbRow['Date'])).')</strong>
+    '.$DbRow['Text'].' <br />';  
   $Output .= '</div>';
   return($Output);
@@ -36 +36 @@
   if($_GET['rss'] == 'news')
   {
-    $DbResult = $Database->SQLCommand('SELECT UNIX_TIMESTAMP(news.Time), news.Time, user.user, news.Text FROM news JOIN user ON user.ID = news.User ORDER BY Time DESC LIMIT 10');
+    $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)) 
     {
       $Items[] = array
     (
-        'Title' => $DbRow['user'].'('.date('d.m.Y', MysqlDateTimeToTime($DbRow['Time'])).')',
+        'Title' => $DbRow['Name'].'('.date('d.m.Y', MysqlDateTimeToTime($DbRow['Time'])).')',
         'Link' =>  $Config['Web']['BaseURL'],
         'Description' => $DbRow['Text'],
-        'Time' => $DbRow['UNIX_TIMESTAMP(news.Time)'],
+        'Time' => $DbRow['UnixTime'],
       );
     } 
@@ -58 +58 @@
   if($_GET['rss'] == 'translation')
   {
-    $DbResult = $Database->SQLCommand('SELECT UNIX_TIMESTAMP(date), date, user.user, text FROM log JOIN user ON user.ID = log.User WHERE type = 1 ORDER BY date DESC LIMIT 100');
+    $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)) 
     {
       $Items[] = array
     (
-        'Title' => strip_tags($DbRow['text'].' ('.$DbRow['user'].')'),
+        'Title' => strip_tags($DbRow['Text'].' ('.$DbRow['UserName'].')'),
         'Link' =>  $Config['Web']['BaseURL'],
-        'Description' => $DbRow['text'],
-        'Time' => $DbRow['UNIX_TIMESTAMP(date)'],
+        'Description' => $DbRow['Text'],
+        'Time' => $DbRow['Date'],
       );
     } 
@@ -82 +82 @@
   $TitleLength = 50;
   mb_internal_encoding('utf-8');
-    $DbResult = $Database->SQLCommand('SELECT UNIX_TIMESTAMP(date), user, text FROM shoutbox ORDER BY ID DESC LIMIT 20');
+    $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)) 
     {
@@ -89 +89 @@
       $Items[] = array
     (
-        'Title' => $DbRow['user'].': '.$Title,
+        'Title' => $DbRow['User'].': '.$Title,
         'Link' =>  $Config['Web']['BaseURL'],
-        'Description' => $DbRow['text'],
-        'Time' => $DbRow['UNIX_TIMESTAMP(date)'],
+        'Description' => $DbRow['Text'],
+        'Time' => $DbRow['UnixDate'],
       );
     } 

trunk/log.php

@@ -6 +6 @@
 {
   $Items = array();
-  if(array_key_exists('type', $_GET)) $Where = ' WHERE `type` = "'.($_GET['type'] * 1).'"'; 
+  if(array_key_exists('type', $_GET)) $Where = ' WHERE `Type` = "'.($_GET['type'] * 1).'"'; 
     else $Where = '';
-  $sql = 'SELECT *,UNIX_TIMESTAMP(`date`), (SELECT `user`.`user` FROM `user` WHERE `user`.`id` = `log`.`user`) AS `user` FROM `log`'.$Where.' ORDER BY `date` DESC LIMIT 100';
+  $sql = 'SELECT *,UNIX_TIMESTAMP(`Date`), (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 = $Database->SQLCommand('SELECT * FROM `LogType` WHERE `Id`='.$Line['type']);
+    $DbResult = $Database->SQLCommand('SELECT * FROM `LogType` WHERE `Id`='.$Line['Type']);
     $LogType = mysql_fetch_assoc($DbResult);
     
     $Items[] = array
     (
-      'Title' => strip_tags($LogType['Name'].': '.$Line['text'].' ('.$Line['user'].', '.$Line['IP'].')'),
+      'Title' => strip_tags($LogType['Name'].': '.$Line['Text'].' ('.$Line['Name'].', '.$Line['IP'].')'),
       'Link' =>  $Config['Web']['BaseURL'].'log.php',
-      'Description' => $LogType['Name'].': '.$Line['text'].' ('.$Line['user'].', '.$Line['IP'].')',
-      'Time' => $Line['UNIX_TIMESTAMP(date)'],
+      'Description' => $LogType['Name'].': '.$Line['Text'].' ('.$Line['Name'].', '.$Line['IP'].')',
+      'Time' => $Line['UNIX_TIMESTAMP(Date)'],
     );
   } 
@@ -39 +39 @@
   if(array_key_exists('group', $_GET)) $_SESSION['group'] = $_GET['group'];
 
-  if($_SESSION['type'] != '') $WhereType = ' `type`='.$_SESSION['type']; 
+  if($_SESSION['type'] != '') $WhereType = ' `Type`='.$_SESSION['type']; 
     else $WhereType = '1=1';
     
@@ -61 +61 @@
   else
   {
-    if(array_key_exists('group', $_SESSION)) $Where = ' WHERE `text` LIKE "%'.$TranslationTree[$_SESSION['group']]['Name'].'%"';
+    if(array_key_exists('group', $_SESSION)) $Where = ' WHERE `Text` LIKE "%'.$TranslationTree[$_SESSION['group']]['Name'].'%"';
       else $Where = '';
   } 
   //if(($Where != '') and (array_key_exists('group', $_SESSION))) $Where .= ' AND text LIKE "%'.$TranslationTree[$_SESSION['group']]['Name'].'%"';
 
-  $DbResult = $Database->SQLCommand('SELECT COUNT(*) FROM `log` '.$Where);
+  $DbResult = $Database->SQLCommand('SELECT COUNT(*) FROM `Log` '.$Where);
   $DbRow = mysql_fetch_row($DbResult);
   $PageList = GetPageList($DbRow[0]);    
@@ -75 +75 @@
     array('Name' => 'date', 'Title' => 'Čas'), 
     array('Name' => 'text', 'Title' => 'Text'), 
-    array('Name' => 'user', 'Title' => 'Uživatel'), 
+    array('Name' => 'User', 'Title' => 'Uživatel'), 
     array('Name' => 'IP', 'Title' => 'Adresa'), 
   );
@@ -82 +82 @@
   echo($Order['Output']);
   
-  $sql = 'SELECT *, `LogType`.`Color` AS `LogColor`, (SELECT `user`.`user` FROM `user` WHERE `user`.`id` = `log`.`user`) AS `user` FROM `log` LEFT JOIN `LogType` ON `LogType`.`Id`=`log`.`type` '.$Where.$Order['SQL'].$PageList['SQLLimit'];
+  $sql = 'SELECT *, `LogType`.`Color` AS `LogColor`, (SELECT `User`.`Name` FROM `User` WHERE `User`.`ID` = `Log`.`User`) AS `User` 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)) 
   {
-    echo('<tr><td>'.$Line['date'].'</td><td><span style="color: '.$Line['LogColor'].'">'.$Line['text'].'</span></td><td>'.$Line['user'].'</td><td>'.$Line['IP'].'</td></tr>');
+    echo('<tr><td>'.$Line['Date'].'</td><td><span style="color: '.$Line['LogColor'].'">'.$Line['Text'].'</span></td><td>'.$Line['Name'].'</td><td>'.$Line['IP'].'</td></tr>');
   }
   echo('</table>');

trunk/registrace.php

@@ -7 +7 @@
 if(array_key_exists('user', $_POST)) 
 {
-  $User = $_POST['user'];
+  $UserName = $_POST['user'];
   $Pass = $_POST['pass'];
   $Pass2 = $_POST['pass2'];
@@ -19 +19 @@
   if($Pass == $Pass2) 
   {
-    $Line = mysql_fetch_row($Database->SQLCommand('SELECT * FROM user WHERE user = "'.$User.'"'));
+    $Line = mysql_fetch_row($Database->SQLCommand('SELECT * FROM `User` WHERE `User` = "'.$User.'"'));
     if(!$Line) 
     {
       $Address = $_SERVER['REMOTE_ADDR'];
       $Salt = GetPasswordSalt();
-      $Database->SQLCommand('INSERT INTO `user` (`user` , `pass` , `Salt`, `LastIP` , `LastLogin` , `Email` , `Language` , `team` , `NeedUpdate`, `RegistrationTime` )
-      VALUES ("'.$User.'", sha1(CONCAT(sha1("'.$Pass.'"), "'.$Salt.'")), "'.$Salt.'", "'.$Address.'", NOW(), "'.$Email.'", '.$Language.', '.$Team.', 1, NOW())');
-   //   $Database->SQLCommand("INSERT INTO user () VALUES('$User','$Pass','0','$Addres',now(),'0','$Email')");
+      $Database->SQLCommand('INSERT INTO `User` (`Name` , `Pass` , `Salt`, `LastIP` , `LastLogin` , `Email` , `Language` , `Team` , `NeedUpdate`, `RegistrationTime` )
+      VALUES ("'.$UserName.'", sha1(CONCAT(sha1("'.$Pass.'"), "'.$Salt.'")), "'.$Salt.'", "'.$Address.'", NOW(), "'.$Email.'", '.$Language.', '.$Team.', 1, NOW())');
       echo('Registrace proběhla úspěšně.<br />');
       
-      $_SESSION['User'] = $User;
+      $_SESSION['User'] = $UserName;
       $_SESSION['Pass'] = $Pass;
     
-      $Line = mysql_fetch_array($Database->SQLCommand('SELECT ID FROM user WHERE user = "'.$_SESSION['User'].'"'));
+      $Line = mysql_fetch_array($Database->SQLCommand('SELECT `ID` FROM `User` WHERE `Name` = "'.$_SESSION['User'].'"'));
       $_SESSION['UserID'] = $Line['ID']; 
       WriteLog('Uživatel se zaregistroval: '.$User, LOG_TYPE_USER);

trunk/save.php

@@ -19 +19 @@
     else $complete = 0;
              
-  $DbResult = $Database->SQLCommand('SELECT * FROM `'.$Table.'` WHERE (`Language` = 0) AND (`entry` = '.$entry.')');
+  $DbResult = $Database->SQLCommand('SELECT * FROM `'.$Table.'` WHERE (`Language` = 0) AND (`Entry` = '.$entry.')');
   if(mysql_num_rows($DbResult) == 0) ErrorMessage('Neznámé Id položky'); 
   $LineAJ = mysql_fetch_array($DbResult);
   $LineTake = mysql_fetch_array($Database->SQLCommand('SELECT `VersionEnd`, `VersionStart` FROM `'.$Table.'` WHERE `ID` = '.$TextID));
   if(mysql_num_rows($DbResult) == 0) ErrorMessage('Neznámé Id položky');
-  $DbResult = $Database->SQLCommand('SELECT * FROM `'.$Table.'` WHERE (`user`='.$UserID.') AND (`entry` = '.$entry.') AND (`VersionStart` = '.$LineTake['VersionStart'].') AND (`VersionEnd` = '.$LineTake['VersionEnd'].')');
+  $DbResult = $Database->SQLCommand('SELECT * FROM `'.$Table.'` WHERE (`User`='.$UserID.') AND (`Entry` = '.$entry.') AND (`VersionStart` = '.$LineTake['VersionStart'].') AND (`VersionEnd` = '.$LineTake['VersionEnd'].')');
   $Line = mysql_fetch_array($DbResult);
   if(!$Line) 
@@ -69 +69 @@
     while($SameTranLine = mysql_fetch_assoc($SameTranID))
     {
-      $Line = mysql_fetch_array($Database->SQLCommand('SELECT * FROM `'.$Table.'` WHERE (`user`='.$UserID.') AND (`entry` = '.$SameTranLine['entry'].') AND (`VersionStart` = '.$LineTake['VersionStart'].') AND (`VersionEnd` = '.$LineTake['VersionEnd'].')'));
+      $Line = mysql_fetch_array($Database->SQLCommand('SELECT * FROM `'.$Table.'` WHERE (`User`='.$UserID.') AND (`Entry` = '.$SameTranLine['Entry'].') AND (`VersionStart` = '.$LineTake['VersionStart'].') AND (`VersionEnd` = '.$LineTake['VersionEnd'].')'));
       if(!$Line) 
       {
@@ -79 +79 @@
             if($Rank_number <> '') $Rank_cur = $Rank.' '.$Rank_number;
               else $Rank_cur = $SameTranLine['Rank'];
-            $Database->SQLCommand('INSERT INTO `'.$Table.'` (`entry`, '.$Columns.', `Rank`) VALUES ('.$SameTranLine['entry'].','.$Values.',"'.$Rank_cur.'")');
+            $Database->SQLCommand('INSERT INTO `'.$Table.'` (`Entry`, '.$Columns.', `Rank`) VALUES ('.$SameTranLine['Entry'].','.$Values.',"'.$Rank_cur.'")');
           } else 
           { 
-            $Database->SQLCommand('INSERT INTO `'.$Table.'` (`entry`, '.$Columns.') VALUES ('.$SameTranLine['entry'].','.$Values.')');
+            $Database->SQLCommand('INSERT INTO `'.$Table.'` (`Entry`, '.$Columns.') VALUES ('.$SameTranLine['Entry'].','.$Values.')');
           } 
         } else 
         { 
-          $Database->SQLCommand('INSERT INTO `'.$Table.'` (`entry`, '.$Columns.', `ShortCut`) VALUES ('.$SameTranLine['entry'].','.$Values.',"'.$SameTranLine['ShortCut'].'")');
+          $Database->SQLCommand('INSERT INTO `'.$Table.'` (`Entry`, '.$Columns.', `ShortCut`) VALUES ('.$SameTranLine['Entry'].','.$Values.',"'.$SameTranLine['ShortCut'].'")');
         }
         $LastIDs[] = mysql_insert_id();
@@ -119 +119 @@
   $next = FollowingTran($TextID, $Table, $GroupId);
   echo('<br /><br />');
-  $redirecting = mysql_fetch_assoc($Database->SQLCommand('SELECT `redirecting` FROM `user` WHERE `ID`='.$UserID));
+  $redirecting = mysql_fetch_assoc($Database->SQLCommand('SELECT `Redirecting` FROM `User` WHERE `ID`='.$UserID));
     
   switch($redirecting['redirecting']) 
@@ -145 +145 @@
     
   // Aktualizace informace o nutnosti načíst XP
-  $Database->SQLCommand('UPDATE `user` SET `NeedUpdate` = 1 WHERE `ID` = '.$UserID); 
+  $Database->SQLCommand('UPDATE `User` SET `NeedUpdate` = 1 WHERE `ID` = '.$UserID); 
 } else 
 {

trunk/statistic.php

@@ -22 +22 @@
 <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');
+$ID = $Database->SQLCommand('SELECT count(distinct(`IP`)) FROM `Log` WHERE `Type` = 2');
 $Line = mysql_fetch_row($ID);
 echo($Line[0]);
@@ -29 +29 @@
 <div>Počet stáhnutí: <strong>');
       
-$ID = $Database->SQLCommand('SELECT count(distinct(IP)) FROM log WHERE type = 0');
+$ID = $Database->SQLCommand('SELECT count(distinct(`IP`)) FROM `Log` WHERE `Type` = 0');
 $Line = mysql_fetch_row($ID);
 echo($Line[0]);

trunk/team.php

@@ -31 +31 @@
   echo($Order['Output']);
 
-  if(array_key_exists('search', $_GET))  $_SESSION['search'] = ' WHERE `name` LIKE "%'.$_GET['search'].'%" OR `description` LIKE "%'.$_GET['search'].'%"'; 
+  if(array_key_exists('search', $_GET))  $_SESSION['search'] = ' WHERE `Name` LIKE "%'.$_GET['search'].'%" OR `Description` LIKE "%'.$_GET['search'].'%"'; 
     else if(!array_key_exists('search', $_SESSION)) $_SESSION['search'] = '';
     if (array_key_exists('search', $_GET) and ($_GET['search'] == '')) $_SESSION['search'] = '';
@@ -46 +46 @@
     if(!is_numeric($_SESSION['team'])) echo(' <a href="?Where">Zrušit filtr týmů</a><br />');
     */
-    $DbResult = $Database->SQLCommand('SELECT `Team` FROM `user` WHERE `ID`='.$_SESSION['UserID']);
+    $DbResult = $Database->SQLCommand('SELECT `Team` FROM `User` WHERE `ID`='.$_SESSION['UserID']);
     $User = mysql_fetch_assoc($DbResult);   
 
-    $ID = $Database->SQLCommand('SELECT *, (SELECT COUNT(*) FROM `user` WHERE `user`.`team` = `Team`.`Id`) AS `NumberUser`, (SELECT `user` FROM `user` WHERE `user`.`ID`=`Team`.`Leader`) AS `LeaderName` FROM `Team` '.$_SESSION['search'].$Order['SQL'].$PageList['SQLLimit']);
+    $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)) 
     {
@@ -81 +81 @@
     if(array_key_exists('id', $_GET))
     { 
-      $Database->SQLCommand('UPDATE `user` SET `team` = '.$_GET['id'].' WHERE `ID` = '.$_SESSION['UserID']); 
+      $Database->SQLCommand('UPDATE `User` SET `Team` = '.$_GET['id'].' WHERE `ID` = '.$_SESSION['UserID']); 
       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');
+      $Database->SQLCommand('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);');
+      $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`);');
         
       ShowTeamList();
@@ -110 +110 @@
       {
         $Database->SQLCommand('INSERT INTO `Team` (`Name` ,`Description`, `URL`, `TimeCreate`,`Leader`) VALUES ("'.trim($_POST['Name']).'", "'.trim($_POST['Description']).'", "'.$_POST['URL'].'", NOW(), '.$_SESSION['UserID'].')');  
-        $Database->SQLCommand('UPDATE `user` SET `team` = '.mysql_insert_id().' WHERE `ID` = '.$_SESSION['UserID']); 
+        $Database->SQLCommand('UPDATE `User` SET `Team` = '.mysql_insert_id().' WHERE `ID` = '.$_SESSION['UserID']); 
         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');    
+        $Database->SQLCommand('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');
@@ -195 +195 @@
     ImgLevelUpdate();
       
-    $Team = mysql_fetch_assoc($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'])); 
-    $DbResult = $Database->SQLCommand('SELECT user FROM user WHERE ID='.$Team['Leader']);
+    $Team = mysql_fetch_assoc($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'])); 
+    $DbResult = $Database->SQLCommand('SELECT `Name` FROM `User` WHERE `ID`='.$Team['Leader']);
     if(mysql_num_rows($DbResult) > 0) 
     {
       $Leader = mysql_fetch_assoc($DbResult);
-      $Leader = $Leader['user'];
+      $Leader = $Leader['Name'];
     } else $Leader = '';
     
@@ -227 +227 @@
   if(Licence(LICENCE_USER))
   {   
-    $Database->SQLCommand('UPDATE `user` SET `team` = 0 WHERE `ID` = '.$_SESSION['UserID']); 
+    $Database->SQLCommand('UPDATE `User` SET `Team` = 0 WHERE `ID` = '.$_SESSION['UserID']); 
     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');
+    $Database->SQLCommand('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);');
+    $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`);');
         
     ShowTeamList();

trunk/user.php

@@ -10 +10 @@
   $email = $_POST['email'];
   $subject = $_POST['subject'];
-  echo('email: <strong>'.$email.'</strong><br />');
-  echo('předmět: <strong>'.$subject.'</strong><br />');
-  echo('text: <strong>'.$text.'</strong><br />');
+  echo('Email: <strong>'.$email.'</strong><br />');
+  echo('Předmět: <strong>'.$subject.'</strong><br />');
+  echo('Text: <strong>'.$text.'</strong><br />');
     
   if(@mail($email, $subject, $text, 'From: '.$Config['Web']['AdminEmail'].'\nReply-To: '.$Config['Web']['AdminEmail'].'\nX-Mailer: PHP/'))
@@ -26 +26 @@
 if(array_key_exists('user', $_GET) and Licence(LICENCE_MODERATOR)) 
 {  
-  $Query = 'SELECT * FROM `user` WHERE ID = '.$_GET['user'];
-  $LineUser = mysql_fetch_array($Database->SQLCommand($Query));
+  $Query = 'SELECT * FROM `User` WHERE `ID` = '.$_GET['user'];
+  $User = mysql_fetch_array($Database->SQLCommand($Query));
    
-  echo('ID: <strong>'.$_GET['user'].'</strong><br />');
-  echo('Jméno: <strong>'.$LineUser['user'].'</strong><br />');
-  echo('Výchozí jazyk: <strong>'.$LanguageList[$LineUser['Language']]['Name'].'</strong><br />');
-  echo('Poslední připojení: <strong>'.$LineUser['LastLogin'].'</strong><br />');
-  echo('Poslední IP: <strong>'.$LineUser['LastIP'].'</strong><br />');
-  echo('Počet přeložených: <a href="TranslationList.php?user='.$_GET['user'].'&amp;action=userall" title="Zobrazit Všechny jeho přeložené texty"><strong>'.$LineUser['TranslatedCount'].'</strong></a><br />');
-  echo('Email: <strong>'.$LineUser['Email'].'</strong><br />');
+  echo('ID: <strong>'.$User['ID'].'</strong><br />');
+  echo('Jméno: <strong>'.$User['Name'].'</strong><br />');
+  echo('Výchozí jazyk: <strong>'.$LanguageList[$User['Language']]['Name'].'</strong><br />');
+  echo('Poslední připojení: <strong>'.$User['LastLogin'].'</strong><br />');
+  echo('Poslední IP: <strong>'.$User['LastIP'].'</strong><br />');
+  echo('Počet přeložených: <a href="TranslationList.php?user='.$User['ID'].'&amp;action=userall" title="Zobrazit Všechny jeho přeložené texty"><strong>'.$User['TranslatedCount'].'</strong></a><br />');
+  echo('Email: <strong>'.$User['Email'].'</strong><br />');
   echo('<br />
 
 <form action="user.php" method="post"><div>
 Napsat E-mail: 
-<input type="text" name="email" value="'.$LineUser['Email'].'" />
+<input type="text" name="email" value="'.$User['Email'].'" />
 Předmět: 
 <input type="text" name="subject" value="Projekt překládání textů WoW" />

trunk/userlist.php

@@ -11 +11 @@
 if(array_key_exists('search', $_GET))
 {
-  $_SESSION['Where'] = ' WHERE `user`.`user` LIKE "%'.$_GET['search'].'%"'; 
+  $_SESSION['Where'] = ' WHERE `User`.`User` LIKE "%'.$_GET['search'].'%"'; 
 }
 if(array_key_exists('team', $_GET))
 {
-  $_SESSION['Where'] = ' WHERE team='.$_GET['team']; 
+  $_SESSION['Where'] = ' WHERE `Team`='.$_GET['team']; 
   if($_GET['team'] == '') $_SESSION['Where'] = '';     
 }
@@ -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']);
+$DbResult = $Database->SQLCommand('SELECT COUNT(*) FROM `User`'.$_SESSION['Where']);
 $DbRow = mysql_fetch_row($DbResult);
 $PageList = GetPageList($DbRow[0]);    
@@ -34 +34 @@
 
 $TableColumns = array(
-  array('Name' => 'user', 'Title' => 'Jméno'), 
+  array('Name' => 'User', 'Title' => 'Jméno'), 
   array('Name' => 'TranslatedCount', 'Title' => 'Přeložených'), 
   array('Name' => 'XP', 'Title' => 'Úroveň'), 
@@ -44 +44 @@
 
 
-$Query = 'SELECT `ID`, `user`.`user`, `LastLogin`, `GM`, `TranslatedCount` FROM `user` '.$_SESSION['Where'].$Order['SQL'].$PageList['SQLLimit'];
+$Query = 'SELECT `ID`, `User`.`Name`, `LastLogin`, `GM`, `TranslatedCount` FROM `User` '.$_SESSION['Where'].$Order['SQL'].$PageList['SQLLimit'];
 
 $ID = $Database->SQLCommand($Query);
@@ -50 +50 @@
 {
   if(Licence(LICENCE_MODERATOR)) 
-    $Name = '<a href="user.php?user='.$Line['ID'].'">'.$Line['user'].'</a>';
-    else $Name = $Line['user'];
+    $Name = '<a href="user.php?user='.$Line['ID'].'">'.$Line['Name'].'</a>';
+    else $Name = $Line['Name'];
         
     echo('<tr><td>'.$Name.'</td>
       <td style="text-align: center;"><a href="TranslationList.php?user='.$Line['ID'].'&amp;action=userall" title="Zobrazit Všechny jeho přeložené texty">'.$Line['TranslatedCount'].'</a></td>
-      <td><img src="tmp/user/'.$Line['user'].'/level.png" alt="Úroveň uživatele" /></td>
+      <td><img src="tmp/user/'.$Line['Name'].'/level.png" alt="Úroveň uživatele" /></td>
       <td>'.$Moderators[$Line['GM']].'</td>
       <td>'.HumanDate($Line['LastLogin']).'</td></tr>');