Changeset 1166 in ExiteCMS for trunk/administration/user_groups.php

Timestamp:

12/10/07 00:04:23 (4 years ago)

Author:

hverton

Message:

fixed modules.php, when upgrading a module the admin icon in the module directory wasn't checked
groupnames array in user_groups.php now uses getusergroups()

File:

• trunk/administration/user_groups.php (modified) (1 diff)

trunk/administration/user_groups.php

@@ -277 +277 @@
         $variables['group1_groups'] = array();
         $variables['group2_groups'] = array();
-        $result = dbquery("SELECT group_id,group_name,group_groups FROM ".$db_prefix."user_groups WHERE group_id != '$group_id' ORDER BY LOWER(group_name)");
-        while ($data = dbarray($result)) {
-            if (!preg_match("(^\.{$group_id}$|\.{$group_id}\.|\.{$group_id}$)", $data['group_groups'])) {
-                $variables['group1_groups'][] = array('id' => $data['group_id'], 'name' => $data['group_name']);
+        $groups = getusergroups();
+        foreach($groups as $group) {
+            // skip the selected group
+            if ($group[0] == $group_id) continue;
+            // get the group groupmemberships
+            $result = dbquery("SELECT group_groups FROM ".$db_prefix."user_groups WHERE group_id = '".$group[0]."'");
+            if (dbrows($result)) {
+                $data = dbarray($result);
+                if (!preg_match("(^\.{$group_id}$|\.{$group_id}\.|\.{$group_id}$)", $data['group_groups'])) {
+                    $variables['group1_groups'][] = array('id' => $group[0], 'name' => $group[1]);
+                } else {
+                    $variables['group2_groups'][] = array('id' => $group[0], 'name' => $group[1]);
+                }
             } else {
-                $variables['group2_groups'][] = array('id' => $data['group_id'], 'name' => $data['group_name']);
-            }
-        }
-
+                $variables['group1_groups'][] = array('id' => $group[0], 'name' => $group[1]);
+            }
+        }
     }