Changeset 725 for trunk/Modules/User/User.php

Timestamp:

Jan 7, 2014, 8:45:46 PM (11 years ago)

Author:

chronos

Message:

• Fixed: Permanent user logon was not kept after restart of web browser. This is now done with cookies.

File:

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

trunk/Modules/User/User.php

@@ -120 +120 @@
       $User = $DbResult->fetch_assoc();
       $this->Id = $User['ID']; 
-      $this->Database->update('UserOnline', 'SessionId="'.$SID.'"', array('User' => $User['ID'], 'StayLogged' => $StayLogged));     
+      
+      // Prepare cookies for permanent login     
+      $StayLoggedSalt = $this->GetPasswordSalt();
+      $this->Database->update('UserOnline', 'SessionId="'.$SID.'"', array(
+        'User' => $User['ID'], 'StayLogged' => $StayLogged, 'StayLoggedHash' => $StayLoggedSalt));
+      if($StayLogged) 
+      {
+        setcookie('LoginUserId', $User['ID'], time()+365*24*60*60);
+        setcookie('LoginHash', sha1($User['ID'].$StayLoggedSalt), time()+365*24*60*60);
+      } else {
+        setcookie('LoginUserId', '', time() - 3600);
+        setcookie('LoginHash', '', time() - 3600);
+      }      
+      
       $this->Database->query('UPDATE `UserTrace` SET '.
         '`LastLogin` = NOW(), '.
@@ -216 +229 @@
       'ScriptName' => $_SERVER['PHP_SELF']));
       
-    // Check login
+    // Logged permanently? 
+          if(array_key_exists('LoginHash', $_COOKIE)) 
+          { 
+            $DbResult = $this->Database->query('SELECT * FROM `UserOnline` WHERE `User`='.$_COOKIE['LoginUserId']. 
+              ' AND `StayLogged`=1 AND SessionId!="'.$SID.'"'); 
+            if($DbResult->num_rows > 0) 
+            { 
+              $DbRow = $DbResult->fetch_assoc(); 
+              if(sha1($_COOKIE['LoginUserId'].$DbRow['StayLoggedHash']) == $_COOKIE['LoginHash']) 
+              {                
+                $this->Database->query('DELETE FROM `UserOnline` WHERE `SessionId`="'.$SID.'"'); 
+                $this->Database->query('UPDATE `UserOnline` SET `SessionId`="'.$SID.'" WHERE `Id`='.$DbRow['Id']); 
+              } 
+            } 
+    } 
+        
+          // Check login
     $Query = $this->Database->select('UserOnline', '*', '`SessionId`="'.$SID.'"');
     $Row = $Query->fetch_assoc();