Changeset 11582 for extensions/AMenuManager/amm_root.class.inc.php

Timestamp:

Jun 29, 2011, 11:45:00 PM (13 years ago)

Author:

grum

Message:

bug:2371

File:

• extensions/AMenuManager/amm_root.class.inc.php (modified) (3 diffs)

extensions/AMenuManager/amm_root.class.inc.php

@@ -540 +540 @@
     $registeredBlocks = $menu->get_registered_blocks();
 
+    $userGroups=array();
+    $sql="SELECT group_id
+          FROM ".USER_GROUP_TABLE."
+          WHERE user_id = '".$user['id']."';";
+    $result=pwg_query($sql);
+    if($result)
+    {
+      while($row=pwg_db_fetch_assoc($result))
+      {
+        $userGroups[$row['group_id']]='';
+      }
+    }
+
     $sql="SELECT id, `order`, users, groups
           FROM ".$this->tables['blocks']."
@@ -548 +561 @@
       while($row=pwg_db_fetch_assoc($result))
       {
-        $row['users']=explode(',', $row['users']);
-        $row['groups']=explode(',', $row['groups']);
+        $row['users']=(trim($row['users'])=='')?array():explode(',', $row['users']);
+        $row['groups']=(trim($row['groups'])=='')?array():explode(',', $row['groups']);
 
         if(isset($registeredBlocks[$row['id']]))
@@ -559 +572 @@
             if($users->isAllowed($user['status']))
             {
-              $groups->setAlloweds($row['groups'], false);
-              foreach($row['groups'] as $val)
+              if(count($userGroups))
               {
-                if(!$groups->isAllowed($val)) $ok=false;
+                $groups->setAlloweds($row['groups'], false);
+                foreach($row['groups'] as $val)
+                {
+                  if(isset($userGroups[$val]) and !$groups->isAllowed($val)) $ok=false;
+                }
+              }
+              else
+              {
+                if(count($row['groups'])==0) $ok=false;
               }
             }