Changeset 111 for branches

Timestamp:

Jan 19, 2014, 12:43:49 AM (11 years ago)

Author:

chronos

Message:

• Opraveno: Namísto číselného id anonyma používat null hodnotu.

Location:

branches/php

Files:

• . (modified) (1 prop)
• Base/User.php (modified) (1 diff)
• Base/UserOnline.php (modified) (3 diffs)
• CustomOutput.php (modified) (1 diff)
• Module/User/Controller.php (modified) (1 diff)

branches/php

@@ -1 @@
-
 config.php
-
 error.log
+.project

@@ -1 @@
-
 config.php
-
 error.log
+.project

branches/php/Base/User.php

@@ -11 +11 @@
   function LoadData()
   {
-    $DbResult = $this->System->Database->select('User', '*', 'Id='.$this->Id);
-    if($DbResult->num_rows > 0)
-    {
-      $this->Data = $DbResult->fetch_assoc();
-      if($this->Data['Rank'] == '') $this->Data['Rank'] = 0;
-    } else throw new Exception('User with id '.$this->Id.' not found');
+        if($this->Id != null)
+        {
+      $DbResult = $this->System->Database->select('User', '*', 'Id='.$this->Id);
+      if($DbResult->num_rows > 0)
+      {
+        $this->Data = $DbResult->fetch_assoc();
+        if($this->Data['Rank'] == '') $this->Data['Rank'] = 0;
+      } else throw new Exception('User with id '.$this->Id.' not found');
+        } else $this->Data = array();
   }
 

branches/php/Base/UserOnline.php

@@ -7 +7 @@
   var $Id;
   var $User;
-  var $AnonymousUserId;
 
   function __construct($System)
   {
     parent::__construct($System);
-    $this->Id = 0;
-    $this->AnonymousUserId = 98;
-    $this->User = $this->AnonymousUserId;
+    $this->Id = null;
   }
 
@@ -31 +28 @@
     {
       // Create new record
-      $this->System->Database->insert('UserOnline', array('User' => $this->AnonymousUserId,
+      $this->System->Database->insert('UserOnline', array('User' => null,
         'ActivityTime' => 'NOW()', 'SessionId' => '"'.session_id().'"',
         'IpAddress' => '"'.$this->System->GetRemoteAddress().'"',
@@ -54 +51 @@
     {
       $this->System->Database->update('UserOnline', 'SessionId="'.session_id().'"',
-        array('User' => $this->AnonymousUserId));
-      $this->User = $this->AnonymousUserId;
+        array('User' => null));
+      $this->User = null;
     }
   }

branches/php/CustomOutput.php

@@ -45 +45 @@
       $Output .= '<li>'.$this->System->HTML->MakeLink($this->System->Localization->Translate('Links'), $this->System->Navigation->MakeLink('Main', 'Links')).'</li>';
       $Output .= '<li>'.$this->System->HTML->MakeLink($this->System->Localization->Translate('Contact'), $this->System->Navigation->MakeLink('Main', 'Contact')).'</li>';
-    if($this->System->UserOnline->User == $this->System->UserOnline->AnonymousUserId)
+    if($this->System->UserOnline->User == null)
     {
       $Output .= '</ul>';

branches/php/Module/User/Controller.php

@@ -6 +6 @@
 include_once(dirname(__FILE__).'/../../Base/HTML/ListWebObject.php');
 include_once(dirname(__FILE__).'/../../Base/HTML/Controller.php');
-include_once(dirname(__FILE__).'/../Lift/Controller.php');
 
 class UserLoginWebObject extends AddWebObject

@@ -1 @@
-
 config.php
-
 error.log
+.project