Changeset 952 for trunk/Modules/User/UserModel.php

Timestamp:

Aug 9, 2023, 7:36:56 PM (9 months ago)

Author:

chronos

Message:

• Fixed: Checking group permission error.

File:

• trunk/Modules/User/UserModel.php (modified) (4 diffs)

trunk/Modules/User/UserModel.php

@@ -302 +302 @@
 
   function CheckGroupPermission(string $GroupId, string $OperationId): bool
-  {
+  {    
     $PermissionExists = false;
     // First try to check cache group-group relation
@@ -326 +326 @@
       {
         if ($DbRow['AssignedGroup'] != '')
-        if ($this->CheckGroupPermission($DbRow['AssignedGroup'], $OperationId) == true) return true;
+        {
+          if ($this->CheckGroupPermission($DbRow['AssignedGroup'], $OperationId) == true) return true;
+        }
       }
     }
@@ -383 +385 @@
 
     if ($PermissionExists)
-    {
-      if ($this->User['Id'] == null) $UserCondition = '(`User` IS NULL)';
+    {      
+      if ($this->User == null or $this->User['Id'] == null) $UserCondition = '(`User` IS NULL)';
         else $UserCondition = '(`User`="'.$this->User['Id'].'")';
       // Check user-operation relation
@@ -390 +392 @@
       if ($DbResult->num_rows > 0) return true;
 
+      
       // Check user-group relation
-      $DbResult = $this->Database->select('PermissionUserAssignment', 'AssignedGroup', $UserCondition);
+      $DbResult = $this->Database->select('PermissionUserAssignment', 'AssignedGroup', '(`AssignedGroup` IS NOT NULL) AND '.$UserCondition);
       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;