Changeset 406

Timestamp:

Oct 4, 2012, 7:59:51 AM (12 years ago)

Author:

chronos

Message:

• Upraveno: Tabulky oprávnění PermissionUserAssignment a PermissionGroupAssignment změněny na použití indexovaných referencí a cizích klíčů.

Location:

trunk

Files:

• sql/updates/406.sql (added)
• user.php (modified) (2 diffs)

trunk/user.php

@@ -194 +194 @@
   {
     // Check group-group relation
-    $DbResult = $this->Database->select('PermissionGroupAssignment', '*', '`Group`="'.$GroupId.'" AND `Type`="Group"');
-    while($DbRow = $DbResult->fetch_array())
-    {
-       if($this->CheckGroupPermission($DbRow['GroupOrOperation'], $OperationId) == true) return(true);
+    $DbResult = $this->Database->select('PermissionGroupAssignment', '*', '`Group`="'.$GroupId.'" AND `AssignedGroup` IS NOT NULL');
+    while($DbRow = $DbResult->fetch_array())
+    {
+       if($this->CheckGroupPermission($DbRow['AssignedGroup'], $OperationId) == true) return(true);
     }
 
     // Check group-operation relation
-    $DbResult = $this->Database->select('PermissionGroupAssignment', '*', '`Group`="'.$GroupId.'" AND `GroupOrOperation`="'.$OperationId.'" AND `Type`="Operation"');
+    $DbResult = $this->Database->select('PermissionGroupAssignment', '*', '`Group`="'.$GroupId.'" AND `AssignedOperation`="'.$OperationId.'"');
     if($DbResult->num_rows > 0) return(true); 
     return(false);
@@ -215 +215 @@
 
       // Check user-operation relation
-      $DbResult = $this->Database->select('PermissionUserAssignment', '*', '`User`="'.$this->User['Id'].'" AND `GroupOrOperation`="'.$OperationId.'" AND `Type`="Operation"');
+      $DbResult = $this->Database->select('PermissionUserAssignment', '*', '`User`="'.$this->User['Id'].'" AND `AssignedOperation`="'.$OperationId.'"');
       if($DbResult->num_rows > 0) return(true);
 
       // Check user-group relation
-      $DbResult = $this->Database->select('PermissionUserAssignment', 'GroupOrOperation', '`User`="'.$this->User['Id'].'" AND `Type`="Group"');
+      $DbResult = $this->Database->select('PermissionUserAssignment', 'AssignedGroup', '`User`="'.$this->User['Id'].'" AND `AssignedGroup` IS NOT NULL');
       while($DbRow = $DbResult->fetch_array())
       {
-         if($this->CheckGroupPermission($DbRow['GroupOrOperation'], $OperationId) == true) return(true);
+         if($this->CheckGroupPermission($DbRow['AssignedGroup'], $OperationId) == true) return(true);
       }
       return(false);