Changeset 952 for trunk

Timestamp:

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

Author:

chronos

Message:

• Fixed: Checking group permission error.

Location:

trunk

Files:

• Modules/RSS/RSS.php (modified) (3 diffs)
• Modules/User/UserModel.php (modified) (4 diffs)
• Packages/Common/Base.php (modified) (1 diff)

trunk/Modules/RSS/RSS.php

@@ -4 +4 @@
 {
   public array $RSSChannels;
-
+  public array $RSSChannelsPos;
+  
   function __construct(System $System)
   {
@@ -14 +15 @@
     $this->Description = 'Web site RSS channel management';
     $this->RSSChannels = array();
+    $this->RSSChannelsPos = array();
   }
 
@@ -70 +72 @@
       else $ChannelName = '';
     if (array_key_exists('token', $_GET)) $Token = $_GET['token'];
-      else $Token = '';
+      else $Token = '';      
     if (array_key_exists($ChannelName, ModuleRSS::Cast($this->System->GetModule('RSS'))->RSSChannels))
     {

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;

trunk/Packages/Common/Base.php

@@ -16 +16 @@
     return get_called_class();
   }
+
+  public function __debugInfo()
+  {   
+    $Vars = get_object_vars($this);    
+    unset($Vars['System'], $Vars['Database']);
+    return $Vars;
+  }
 }