Changeset 493 for trunk/Common/User.php

Timestamp:

Mar 1, 2013, 9:20:14 PM (12 years ago)

Author:

chronos

Message:

• Přidáno: Zprovozněna kontrola aktuálnosti webu a automatické aktualizace.
• Přidáno: Plná instalace výchozí databáze.
• Upraveno: Anonymní uživatel je nyní reprezentován null hodnotou.

File:

• trunk/Common/User.php (modified) (6 diffs)

trunk/Common/User.php

@@ -51 +51 @@
   var $User = array();
   var $DefaultRole = 2;
-  var $AnonymousUserId = 98;
   var $OnlineStateTimeout = 600; // in seconds
   var $PermissionCache = array();
@@ -74 +73 @@
       $this->Database->update('UserOnline', 'SessionId="'.$SID.'"', array('ActivityTime' => 'NOW()'));
     } else $this->Database->insert('UserOnline', array('SessionId' => $SID, 
-      'User' => $this->AnonymousUserId, 'LoginTime' => 'NOW()', 'ActivityTime' => 'NOW()', 
+      'User' => null, 'LoginTime' => 'NOW()', 'ActivityTime' => 'NOW()', 
       'IpAddress' => GetRemoteAddress(), 'HostName' => gethostbyaddr(GetRemoteAddress()), 
       'ScriptName' => $_SERVER['PHP_SELF']));
-    //echo($this->Database->LastQuery);
 
     // Check login
     $Query = $this->Database->select('UserOnline', '*', 'SessionId="'.$SID.'"');
     $Row = $Query->fetch_assoc();
-    if($Row['User'] != $this->AnonymousUserId) 
+    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']);      
@@ -89 +87 @@
     } else 
     {
-      $Query = $this->Database->select('User', '*', 'Id='.$this->AnonymousUserId);
-      $this->User = $Query->fetch_assoc();
+      $Query = $this->Database->select('User', '*', 'Id IS NULL');
+      $this->User = array('Id' => null, 'Member' => null);
       $Result = USER_NOT_LOGGED;
     }
@@ -99 +97 @@
     {
       $this->Database->delete('UserOnline', 'Id='.$DbRow['Id']);
-      if($DbRow['User'] != $this->AnonymousUserId) $this->System->Modules['Log']->NewRecord('User', 'Logout');
+      if($DbRow['User'] != null) $this->System->Modules['Log']->NewRecord('User', 'Logout');
     }
     //$this->LoadPermission($this->User['Role']);
@@ -198 +196 @@
         // načtení stavu stromu
         $Result = USER_LOGGED_IN;
+        $this->Check();
         $this->System->Modules['Log']->NewRecord('User', 'Login', 'Login='.$Login.',Host='.gethostbyaddr(GetRemoteAddress()));
       }
     } else $Result = USER_NOT_REGISTRED;
-    $this->Check();
     return($Result);
   }
@@ -208 +206 @@
   {
     $SID = session_id();
-    $this->Database->update('UserOnline', 'SessionId="'.$SID.'"', array('User' => $this->AnonymousUserId));
+    $this->Database->update('UserOnline', 'SessionId="'.$SID.'"', array('User' => null));
     $this->System->Modules['Log']->NewRecord('User', 'Logout', $this->User['Login']);
     $this->Check();