Changeset 365 for trunk/includes

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/includes

Files:

• global.php (modified) (7 diffs)
• global_function.php (modified) (3 diffs)

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