Changeset 381 for trunk

Timestamp:

Jan 22, 2012, 9:17:36 PM (13 years ago)

Author:

chronos

Message:

• Opraveno: Instalace anonymního uživatele.
• Opraveno: Odkazy na model User.

Location:

trunk

Files:

• Common/Page.php (modified) (1 diff)
• Modules/User/User.php (modified) (4 diffs)

trunk/Common/Page.php

@@ -158 +158 @@
     if($this->System->Config['Web']['UserSupport'] == 1)
     {
-      if($this->System->Models['User']->User['Id'] == $this->System->Models['User']->AnonymousUserId)
+      if($this->System->Modules['User']->Models['User']->User['Id'] == $this->System->Modules['User']->Models['User']->AnonymousUserId)
         $Output .= '<a href="'.$this->System->Config['Web']['RootFolder'].'/?Action=LoginForm">Přihlášení</a> <a href="'.$this->System->Config['Web']['RootFolder'].'/?Action=UserRegister">Registrace</a>'; 
-        else $Output .= $this->System->Models['User']->User['Name'].' <a href="'.$this->System->Config['Web']['RootFolder'].'/?Action=Logout">Odhlásit</a>';
+        else $Output .= $this->System->Modules['User']->Models['User']->User['Name'].' <a href="'.$this->System->Config['Web']['RootFolder'].'/?Action=Logout">Odhlásit</a>';
    } else $Output .= '&nbsp;';
 // <a href="'.$this->System->Config['Web']['RootFolder'].'/?Action=UserOptions">Nastavení</a>'; 

trunk/Modules/User/User.php

@@ -3 +3 @@
 include(dirname(__FILE__).'/UserList.php');
 include(dirname(__FILE__).'/UserPermission.php');
+
+define('ANONYMOUS_ID', 1);
 
 define('LOGIN_USED', 'Přihlašovací jméno již použito.');
@@ -34 +36 @@
   var $Roles = array();
   var $User = array();
-  var $DefaultRole = 2;
-  var $AnonymousUserId = 98;
+  var $AnonymousUserId = 1;
   var $OnlineStateTimeout = 600; // in seconds
   var $PermissionCache = array();
@@ -380 +381 @@
   function Init()
   {      
-    $this->System->Models['User'] = new User($this->Database, $this->System);
+    $this->System->Modules['User']->Models['User'] = new User($this->Database, $this->System);
+    $thus->System->Modules['User']->Models['User']->AnonymousUserId = ANONYMOUS_ID;
     $this->System->Pages['uzivatele'] = 'UserListPage';
-    if(isset($_SERVER['REMOTE_ADDR'])) $this->System->Models['User']->Check();
+    if(isset($_SERVER['REMOTE_ADDR'])) $this->System->Modules['User']->Models['User']->Check();
   }
   
@@ -388 +390 @@
   {
     parent::Install();
+    $this->Database->insert('User', array('Id' => ANONYMOUS_ID, 'Login' => 'Anonymous', 'Name' => 'Anonymous', 
+      'Password' => ''));
   }