Changeset 415 for trunk/user.php

Timestamp:

Oct 7, 2012, 8:37:15 PM (12 years ago)

Author:

chronos

Message:

• Upraveno: Optimalizace kontroly oprávnění operací.
• Upraveno: Načítání skupin odkazů na hlavní stránce.

Location:

trunk

Files:

• . (modified) (1 prop)
• user.php (modified) (4 diffs)

trunk

@@ -6 +6 @@
 postfixadmin
 backup
+.project
+.buildpath
+.settings

@@ -6 +6 @@
 postfixadmin
 backup
+.project
+.buildpath
+.settings

trunk/user.php

@@ -34 +34 @@
   var $AnonymousUserId = 98;
   var $OnlineStateTimeout = 600; // in seconds
+  var $PermissionCache = array();
 
   function Check()
@@ -52 +53 @@
     if($Row['User'] != $this->AnonymousUserId) 
     {
-      $Query = $this->Database->query('SELECT *, 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 JOIN UserCustomerRel ON UserCustomerRel.User=User.Id WHERE User.Id='.$Row['User']);      
       $this->User = $Query->fetch_assoc();
       $Result = USER_LOGGED;
@@ -208 +209 @@
   function CheckPermission($Module, $Operation, $ItemType = '', $ItemIndex = 0)
   {
-        $DbResult = $this->Database->select('PermissionOperation', 'Id', '`Module`="'.$Module.'" AND `Item`="'.$ItemType.'" AND `ItemId`='.$ItemIndex.' AND `Operation`="'.$Operation.'"');
-    if($DbResult->num_rows > 0)
-    {
-      $DbRow = $DbResult->fetch_array();
-      $OperationId = $DbRow['Id'];
-
+    // 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);
+      $PermissionExists = is_numeric($OperationId);
+    } else 
+    {    
+      // If no permission combination exists in cache, do new check of database items
+      $DbResult = $this->Database->select('PermissionOperation', 'Id', '`Module`="'.$Module.'" AND `Item`="'.$ItemType.'" AND `ItemId`='.$ItemIndex.' AND `Operation`="'.$Operation.'"');
+      if($DbResult->num_rows > 0)
+      {
+        $DbRow = $DbResult->fetch_array();
+        $OperationId = $DbRow['Id'];
+        $this->PermissionCache[$DbRow['Id']] = array($Module, $Operation, $ItemType, $ItemType);        
+        $PermissionExists = true;
+      } else 
+      {          
+        $this->PermissionCache[$DbRow['Id'].'_'] = array($Module, $Operation, $ItemType, $ItemType);        
+        $PermissionExists = false;
+      }
+    } 
+
+    if($PermissionExists)
+    {
       // Check user-operation relation
       $DbResult = $this->Database->select('PermissionUserAssignment', '*', '`User`="'.$this->User['Id'].'" AND `AssignedOperation`="'.$OperationId.'"');
@@ -219 +238 @@
 
       // Check user-group relation
-      $DbResult = $this->Database->select('PermissionUserAssignment', 'AssignedGroup', '`User`="'.$this->User['Id'].'" AND `AssignedGroup` IS NOT NULL');
+      $DbResult = $this->Database->select('PermissionUserAssignment', 'AssignedGroup', '`User`="'.$this->User['Id'].'"');
       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);

@@ -6 +6 @@
 postfixadmin
 backup
+.project
+.buildpath
+.settings