Changeset 425 for branches/Modular/Modules/User/User.php

Timestamp:

Oct 10, 2012, 12:21:38 PM (12 years ago)

Author:

chronos

Message:

• Upraveno: Automatické spouštění instalovaných modulů.

File:

• branches/Modular/Modules/User/User.php (modified) (4 diffs)

branches/Modular/Modules/User/User.php

@@ -189 +189 @@
   {
     // Check group-group relation
-    $DbResult = $this->Database->select('PermissionGroupAssignment', '*', '`Group`="'.$GroupId.'"');
+    $DbResult = $this->Database->select('PermissionGroupAssignment', '*', '`Group`="'.$GroupId.'" AND (AssignedGroup IS NOT NULL)');
     while($DbRow = $DbResult->fetch_array())
     {
@@ -232 +232 @@
 
       // Check user-group relation
-      $DbResult = $this->Database->select('PermissionUserAssignment', 'AssignedGroup', '`User`="'.$this->User['Id'].'"');
+      $DbResult = $this->Database->select('PermissionUserAssignment', 'AssignedGroup', '`User`="'.$this->User['Id'].'" AND (AssignedGroup IS NOT NULL)');
       while($DbRow = $DbResult->fetch_array())
-      {
-       if($this->CheckGroupPermission($DbRow['AssignedGroup'], $OperationId) == true) return(true);
+      {          
+         if($this->CheckGroupPermission($DbRow['AssignedGroup'], $OperationId) == true) return(true);
       }
       return(false);
@@ -380 +380 @@
   function Start()
   {      
+    if($this->Running) return;
     parent::Start();
     $this->System->Modules['User']->Models['User'] = new User($this->Database, $this->System);
-    $thus->System->Modules['User']->Models['User']->AnonymousUserId = ANONYMOUS_ID;
+    $this->System->Modules['User']->Models['User']->AnonymousUserId = ANONYMOUS_ID;
     $this->System->Pages['uzivatele'] = 'UserListPage';
     if(isset($_SERVER['REMOTE_ADDR'])) $this->System->Modules['User']->Models['User']->Check();    
@@ -393 +394 @@
     if(!$Installed)
     {
-      $this->Database->insert('User', array('Id' => ANONYMOUS_ID, 'Login' => 'Anonymous', 'Name' => 'Anonymous', 
-        'Password' => ''));
+      //$this->Database->insert('User', array('Id' => ANONYMOUS_ID, 'Login' => 'Anonymous', 'Name' => 'Anonymous', 
+      //  'Password' => ''));
     }
   }