Changeset 378 for trunk

Timestamp:

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

Author:

george

Message:

• Opraveno: Chyba řazení sloupce jména v seznamu překladatelů.
• Opraveno: Aktualizace přítomnosti uživatelů.
• Opraveno: Zobrazení souvislostí překladů.

Location:

trunk

Files:

• TranslationList.php (modified) (1 diff)
• includes/user.php (modified) (4 diffs)
• userlist.php (modified) (1 diff)

trunk/TranslationList.php

@@ -65 +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`.`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.'"');
+   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.'")');
 }
 

trunk/includes/user.php

@@ -37 +37 @@
       $this->Load();
       WriteLog('Login: '.$Name, LOG_TYPE_USER);
-
-      // Záznam o aktivitě
-      if(array_key_exists('REMOTE_ADDR', $_SERVER)) 
-        $Database->SQLCommand('UPDATE `User` SET `LastIP` = "'.$_SERVER['REMOTE_ADDR'].'", `LastLogin` = NOW() WHERE `ID` = '.$this->Id);
+      $this->UpdateState();
     } else $ŧhis->Role = LICENCE_ANONYMOUS;
   }
@@ -59 +56 @@
     $DbResult = $Database->SQLCommand('SELECT * FROM `User` WHERE `ID` = '.$this->Id);
     $User = mysql_fetch_assoc($DbResult);
+    // Security: Password and Salt hash should not be loaded to variables
     $this->Id = $User['ID'];
     $this->Team = $User['Team'];
@@ -73 +71 @@
     {
       $this->Id = $_SESSION['UserId'];
-      if($this->Id != 0) $this->Load();
-        else $this->SetAnonymous();
+      if($this->Id != 0)
+      {
+        $this->Load();
+        $this->UpdateState();
+      } else $this->SetAnonymous();
     } else $this->SetAnonymous();
   }
@@ -111 +112 @@
     return('sha1(CONCAT(sha1('.$Password.'), '.$Salt.'))');
   } 
+  
+  function UpdateState()
+  {
+    global $Database;
+    
+    if(array_key_exists('REMOTE_ADDR', $_SERVER)) 
+      $Database->SQLCommand('UPDATE `User` SET `LastIP` = "'.$_SERVER['REMOTE_ADDR'].'", `LastLogin` = NOW() WHERE `ID` = '.$this->Id);
+  }
 }
 

trunk/userlist.php

@@ -34 +34 @@
 
 $TableColumns = array(
-  array('Name' => 'User', 'Title' => 'Jméno'), 
+  array('Name' => 'Name', 'Title' => 'Jméno'), 
   array('Name' => 'TranslatedCount', 'Title' => 'Přeložených'), 
   array('Name' => 'XP', 'Title' => 'Úroveň'),