Changeset 356 for trunk

Timestamp:

Jan 18, 2012, 10:21:43 AM (13 years ago)

Author:

chronos

Message:

• Upraveno: Zrychlení kontroly uživatelských oprávnění pro opakované kontroly se stejnými podmínkami.

Location:

trunk

Files:

• Common/Database.php (moved) (moved from trunk/database.php )
• Common/NetworkAddress.php (moved) (moved from trunk/network_address.php )
• Modules/User/User.php (modified) (3 diffs)
• forms.php (modified) (1 diff)
• global.php (modified) (2 diffs)
• system/generators/common.php (modified) (1 diff)

trunk/Modules/User/User.php

@@ -34 +34 @@
   var $AnonymousUserId = 98;
   var $OnlineStateTimeout = 600; // in seconds
+  var $PermissionCache = array();
 
   function __construct($Database, $System)
@@ -226 +227 @@
   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 `GroupOrOperation`="'.$OperationId.'" AND `Type`="Operation"');
@@ -240 +259 @@
       while($DbRow = $DbResult->fetch_array())
       {
-         if($this->CheckGroupPermission($DbRow['GroupOrOperation'], $OperationId) == true) return(true);
+       if($this->CheckGroupPermission($DbRow['GroupOrOperation'], $OperationId) == true) return(true);
       }
       return(false);

trunk/forms.php

@@ -2 +2 @@
 
 include_once('form_classes.php');
-include_once('database.php');
+include_once('Common/Database.php');
 
 class Form

trunk/global.php

@@ -6 +6 @@
   else die('Nenalezen konfigurační soubor '.$ConfigFileName.'!');
   
-include_once('database.php');
+include_once('Common/Database.php');
 include_once('Common/Error.php');
 include_once('Common/Code.php');
@@ -204 +204 @@
   $System = new System($Database);
   $System->Config = &$Config;
-  $System->ReloadList();
-  $System->Install();
+  //$System->ReloadList();
+  //$System->Install();
   $System->Init();
   if(isset($_SERVER['REMOTE_ADDR'])) $System->Models['User']->Check();

trunk/system/generators/common.php

@@ -1 +1 @@
 <?php
 
-include_once('../../network_address.php');
+include_once('../../Common/NetworkAddress.php');
 
 function GetMarkByComment($Comment)