Changeset 524 for trunk/Modules/User

Timestamp:

Apr 20, 2013, 8:51:15 PM (12 years ago)

Author:

chronos

Message:

• Upraveno: Definice třída User přesunuta do modulu User. Existuje aplikační modul System->ModuleManager->ModulesUser a samotná instance třídy System->User.
• Upraveno: Zbylá inicializace starého modulového systému třídy Module přesunuta do startovní části aplikačních modulů.
• Upraveno: Třída System přesunuta ze souboru Common/Global do samostatného souboru Common/System.

File:

• trunk/Modules/User/User.php (moved) (moved from trunk/Common/User.php ) (12 diffs)

trunk/Modules/User/User.php

@@ -1 +1 @@
 <?php
+
+include_once(dirname(__FILE__).'/UserList.php');
 
 define('LOGIN_USED', 'Přihlašovací jméno již použito.');
@@ -47 +49 @@
 class User extends Module
 {
-  var $Dependencies = array('Log');
   var $Roles = array();
   var $User = array();
-  var $DefaultRole = 2;
   var $OnlineStateTimeout = 600; // in seconds
   var $PermissionCache = array();
@@ -58 +58 @@
   var $PasswordHash;
   
-  function __construct()
-  {
+  function __construct($System)
+  {
+    parent::__construct($System);
     $this->PasswordHash = new PasswordHash();
   }
@@ -97 +98 @@
     {
       $this->Database->delete('UserOnline', 'Id='.$DbRow['Id']);
-      if($DbRow['User'] != null) $this->System->Modules['Log']->NewRecord('User', 'Logout');
+      if($DbRow['User'] != null) $this->System->ModuleManager->Modules['Log']->NewRecord('User', 'Logout');
     }
     //$this->LoadPermission($this->User['Role']);
@@ -107 +108 @@
   function Register($Login, $Password, $Password2, $Email, $Name, $PhoneNumber, $ICQ)
   {
-    global $Options, $Config;
+    global $Config;
 
     if(($Email == '') || ($Login == '') || ($Password == '') || ($Password2 == '')  || ($Name == '')) $Result = DATA_MISSING;
@@ -155 +156 @@
             
             $Result = USER_REGISTRATED;
-            $this->System->Modules['Log']->NewRecord('User', 'NewRegistration', $Login);
+            $this->System->ModuleManager->Modules['Log']->NewRecord('User', 'NewRegistration', $Login);
           }
         }
@@ -174 +175 @@
         $this->Database->update('User', 'Id='.$Row['Id'], array('Locked' => 0));
         $Output = USER_REGISTRATION_CONFIRMED;
-        $this->System->Modules['Log']->NewRecord('User', 'RegisterConfirm', 'Login='.
+        $this->System->ModuleManager->Modules['Log']->NewRecord('User', 'RegisterConfirm', 'Login='.
           $Row['Login'].', Id='.$Row['Id']);
       } else $Output = PASSWORDS_UNMATCHED;
@@ -198 +199 @@
         $Result = USER_LOGGED_IN;
         $this->Check();
-        $this->System->Modules['Log']->NewRecord('User', 'Login', 'Login='.$Login.',Host='.gethostbyaddr(GetRemoteAddress()));
+        $this->System->ModuleManager->Modules['Log']->NewRecord('User', 'Login', 'Login='.$Login.',Host='.gethostbyaddr(GetRemoteAddress()));
       }
     } else $Result = USER_NOT_REGISTRED;
@@ -208 +209 @@
     $SID = session_id();
     $this->Database->update('UserOnline', 'SessionId="'.$SID.'"', array('User' => null));
-    $this->System->Modules['Log']->NewRecord('User', 'Logout', $this->User['Login']);
+    $this->System->ModuleManager->Modules['Log']->NewRecord('User', 'Logout', $this->User['Login']);
     $this->Check();
     return(USER_LOGGED_OUT);
@@ -354 +355 @@
       
       $Output = USER_PASSWORD_RECOVERY_SUCCESS;
-      $this->System->Modules['Log']->NewRecord('User', 'PasswordRecoveryRequest', 'Login='.$Login.',Email='.$Email);
+      $this->System->ModuleManager->Modules['Log']->NewRecord('User', 'PasswordRecoveryRequest', 'Login='.$Login.',Email='.$Email);
     } else $Output = USER_PASSWORD_RECOVERY_FAIL;
     return($Output);
@@ -373 +374 @@
           'Salt' => $Salt, 'Locked' => 0));
         $Output = USER_PASSWORD_RECOVERY_CONFIRMED;
-        $this->System->Modules['Log']->NewRecord('User', 'PasswordRecoveryConfirm', 'Login='.$Row['Login']);
+        $this->System->ModuleManager->Modules['Log']->NewRecord('User', 'PasswordRecoveryConfirm', 'Login='.$Row['Login']);
       } else $Output = PASSWORDS_UNMATCHED;
     } else $Output = USER_NOT_FOUND;
@@ -380 +381 @@
 }
 
+class ModuleUser extends AppModule
+{
+  function __construct($System)
+  {
+    parent::__construct($System);
+    $this->Name = 'User';
+    $this->Version = '1.0';
+    $this->Creator = 'Chronos';
+    $this->License = 'GNU/GPLv3';
+    $this->Description = 'User management';
+    $this->Dependencies = array();
+  }  
+
+  function Install()
+  {
+  }
+  
+  function Uninstall()
+  {     
+  }
+  
+  function Start()
+  {
+    parent::Start();
+    $this->System->User = new User($this->System);
+    if(isset($_SERVER['REMOTE_ADDR'])) $this->System->User->Check();
+    $this->System->RegisterPage('userlist', 'PageUserList');
+  }  
+  
+  function Stop()
+  { 
+  } 
+}
+
 ?>