Changeset 515 for trunk/Common/User.php

Timestamp:

Apr 8, 2013, 11:15:52 PM (11 years ago)

Author:

chronos

Message:

• Opraveno: Načítání oprávnění anonymního uživatele. Dříve byl uživatel identifikován předvoleným číslem, nyní je použita hodnota NULL.

File:

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

trunk/Common/User.php

@@ -113 +113 @@
     else
     {
-      // Je uživatel registrován?
+      // Is user registred yet?
       $Query = $this->Database->select('User', '*', 'Login = "'.$Login.'"');
       if($Query->num_rows > 0) $Result = LOGIN_USED;
@@ -138 +138 @@
             $NewPassword = substr(sha1(strtoupper($Login)), 0, 7);
             
+            // Send activation mail to user email
             $Mail = new Mail();
             $Mail->Subject = 'Registrace nového účtu';
@@ -194 +195 @@
         $this->Database->update('User', 'Id='.$Row['Id'], array('LastLoginTime' => 'NOW()', 'LastIpAddress' => GetRemoteAddress()));            
         $this->Database->update('UserOnline', 'SessionId="'.$SID.'"', array('User' => $Row['Id']));
-        // načtení stavu stromu
+        
         $Result = USER_LOGGED_IN;
         $this->Check();
@@ -289 +290 @@
   function CheckPermission($Module, $Operation, $ItemType = '', $ItemIndex = 0)
   {
-    //echo('Check '.$Module.' '.$Operation.' '.$ItemType.' '.$ItemIndex);
-    //
     // First try to check cache
     if(in_array(array($Module, $Operation, $ItemType, $ItemType), $this->PermissionCache)) 
@@ -315 +314 @@
     if($PermissionExists)
     {
+      if($this->User['Id'] == null) $UserCondition = '(`User` IS NULL)';
+        else $UserCondition = '(`User`="'.$this->User['Id'].'")';
       // Check user-operation relation
-      $DbResult = $this->Database->select('PermissionUserAssignment', '*', '`User`="'.$this->User['Id'].'" AND `AssignedOperation`="'.$OperationId.'"');
+      $DbResult = $this->Database->select('PermissionUserAssignment', '*', $UserCondition.' AND (`AssignedOperation`="'.$OperationId.'")');      
       if($DbResult->num_rows > 0) return(true);
 
       // Check user-group relation
-      $DbResult = $this->Database->select('PermissionUserAssignment', 'AssignedGroup', '`User`="'.$this->User['Id'].'"');
+      $DbResult = $this->Database->select('PermissionUserAssignment', 'AssignedGroup', $UserCondition);
       while($DbRow = $DbResult->fetch_array())
       {