Changeset 619 for trunk/Modules/User

Timestamp:

Dec 26, 2013, 7:37:44 PM (11 years ago)

Author:

chronos

Message:

• Přidáno: Volba pro trvalé přihlášení uživatele.
• Opraveno: Ošetření chyb v SQL dotazech při povýšení verze databáze.

File:

• trunk/Modules/User/User.php (modified) (7 diffs)

trunk/Modules/User/User.php

@@ -42 +42 @@
   function GetSalt()
   {
-    mt_srand(microtime(true)*100000 + memory_get_usage(true));
+    mt_srand(microtime(true) * 100000 + memory_get_usage(true));
     return sha1(uniqid(mt_rand(), true));
   }
@@ -53 +53 @@
   var $Roles = array();
   var $User = array();
-  var $OnlineStateTimeout = 600; // in seconds
+  var $OnlineStateTimeout;
   var $PermissionCache = array();
   var $PermissionGroupCache = array();
@@ -63 +63 @@
   {
     parent::__construct($System);
+    $this->OnlineStateTimeout = 600; // in seconds
     $this->PasswordHash = new PasswordHash();
   }
@@ -81 +82 @@
 
     // Check login
-    $Query = $this->Database->select('UserOnline', '*', 'SessionId="'.$SID.'"');
+    $Query = $this->Database->select('UserOnline', '*', '`SessionId`="'.$SID.'"');
     $Row = $Query->fetch_assoc();
     if($Row['User'] != '') 
     {
-      $Query = $this->Database->query('SELECT User.*, UserCustomerRel.Customer AS Member FROM User LEFT JOIN UserCustomerRel ON UserCustomerRel.User=User.Id WHERE User.Id='.$Row['User']);      
+      $Query = $this->Database->query('SELECT `User`.*, `UserCustomerRel`.`Customer` AS `Member` FROM `User` '.
+        ' LEFT JOIN `UserCustomerRel` ON `UserCustomerRel`.`User`=`User`.`Id` WHERE `User`.`Id`='.$Row['User']);      
       $this->User = $Query->fetch_assoc();
       $Result = USER_LOGGED;
@@ -96 +98 @@
 
     // Remove nonactive users
-    $DbResult = $this->Database->select('UserOnline', 'Id, User', 'ActivityTime < DATE_SUB(NOW(), INTERVAL '.$this->OnlineStateTimeout.' SECOND)');
+    $DbResult = $this->Database->select('UserOnline', '`Id`, `User`', '(`ActivityTime` < DATE_SUB(NOW(), INTERVAL '.$this->OnlineStateTimeout.' SECOND)) AND (`StayLogged` = 0)');
     while($DbRow = $DbResult->fetch_array())
     {
@@ -181 +183 @@
   }
 
-  function Login($Login, $Password)
+  function Login($Login, $Password, $StayLogged = false)
   {
     $SID = session_id();
@@ -194 +196 @@
       {
         $this->Database->update('User', 'Id='.$Row['Id'], array('LastLoginTime' => 'NOW()', 'LastIpAddress' => GetRemoteAddress()));            
-        $this->Database->update('UserOnline', 'SessionId="'.$SID.'"', array('User' => $Row['Id']));
+        $this->Database->update('UserOnline', 'SessionId="'.$SID.'"', array('User' => $Row['Id'], 'StayLogged' => $StayLogged));
         
         $Result = USER_LOGGED_IN;