Changeset 426 for trunk/user.php

Timestamp:

Oct 10, 2012, 8:28:07 PM (12 years ago)

Author:

chronos

Message:

• Přidáno: Tlačítko zrušit u formulářů.
• Opraveno: Chyba načítání informací o uživateli pokud neměl vazbu na Member/Customer.

File:

• trunk/user.php (modified) (5 diffs)

trunk/user.php

@@ -36 +36 @@
   var $PermissionCache = array();
   var $PermissionGroupCache = array();
+  var $PermissionGroupCacheOp = array();
 
   function Check()
@@ -54 +55 @@
     if($Row['User'] != $this->AnonymousUserId) 
     {
-      $Query = $this->Database->query('SELECT User.*, UserCustomerRel.Customer AS Member FROM User JOIN UserCustomerRel ON UserCustomerRel.User=User.Id WHERE User.Id='.$Row['User']);      
+      $Query = $this->Database->query('SELECT User.*, UserCustomerRel.Customer AS Member FROM User LEFT JOIN UserCustomerRel ON UserCustomerRel.User=User.Id WHERE User.Id='.$Row['User']);      
       $this->User = $Query->fetch_assoc();
       $Result = USER_LOGGED;
@@ -218 +219 @@
     }
 
-
     // Check group-operation relation
-    $DbResult = $this->Database->select('PermissionGroupAssignment', '*', '`Group`="'.$GroupId.'" AND `AssignedOperation`="'.$OperationId.'"');
-    if($DbResult->num_rows > 0) return(true); 
+    if(array_key_exists($GroupId.','.$OperationId, $this->PermissionGroupCacheOp))
+    {
+      $PermissionExists = true; 
+    } else 
+    {          
+      // If no permission combination exists in cache, do new check of database items            
+      $DbResult = $this->Database->select('PermissionGroupAssignment', '*', '`Group`="'.$GroupId.'" AND `AssignedOperation`="'.$OperationId.'"');
+      if($DbResult->num_rows > 0) $this->PermissionGroupCacheOp[$GroupId.','.$OperationId] = true;
+        else $this->PermissionGroupCacheOp[$GroupId.','.$OperationId] = false;
+      $PermissionExists = true; 
+    }
+    if($PermissionExists)
+    {
+      return($this->PermissionGroupCacheOp[$GroupId.','.$OperationId]);
+    }
     return(false);
   }
@@ -227 +240 @@
   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)) 
     {
-      $OperationId = array_search(array($Module, $Operation, $ItemType, $ItemType), $this->PermissionCache);
+      $OperationId = array_search(array($Module, $Operation, $ItemType, $ItemIndex), $this->PermissionCache);
       $PermissionExists = is_numeric($OperationId);
     } else 
@@ -240 +255 @@
         $DbRow = $DbResult->fetch_array();
         $OperationId = $DbRow['Id'];
-        $this->PermissionCache[$DbRow['Id']] = array($Module, $Operation, $ItemType, $ItemType);        
+        $this->PermissionCache[$DbRow['Id']] = array($Module, $Operation, $ItemType, $ItemIndex);
         $PermissionExists = true;
       } else 
       {          
-        $this->PermissionCache[$DbRow['Id'].'_'] = array($Module, $Operation, $ItemType, $ItemType);        
+        $this->PermissionCache[$DbRow['Id'].'_'] = array($Module, $Operation, $ItemType, $ItemIndex);        
         $PermissionExists = false;
       }