Changeset 1166 in ExiteCMS

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()

Location:

trunk/administration

Files:

• modules.php (modified) (3 diffs)
• user_groups.php (modified) (1 diff)

trunk/administration/modules.php

@@ -290 +290 @@
     $data = dbarray($result);
 
-    // load the module installer to start deinstallation
+    // load the module installer to start the upgrade
     include PATH_MODULES.$data['mod_folder']."/module_installer.php";
 
@@ -303 +303 @@
 
         // check if an icon for the admin panel is defined, If not, use the modules and plugins default icon
-        if ($mod_admin_image == "" || !file_exists(PATH_ADMIN."images/".$mod_admin_image)) $mod_admin_image = "modules_panel.gif";
+        if ($mod_admin_image == "" || (!file_exists(PATH_MODULES.$mod_folder."/images/".$mod_admin_image) && !file_exists(PATH_ADMIN."images/".$mod_admin_image))) $mod_admin_image = "modules_panel.gif";
 
         // check if the admin panel is already defined
@@ -314 +314 @@
             $result = dbquery("UPDATE ".$db_prefix."admin SET admin_rights = '".$mod_admin_rights."', admin_image = '$mod_admin_image', admin_title = '$mod_title', admin_page = '".$mod_admin_page."' WHERE admin_link = '".MODULES."$mod_folder/$mod_admin_panel'");
         }
+        // make sure superadmins have rights to all defined admin modules
+        $result2 = dbquery("SELECT admin_rights FROM ".$db_prefix."admin");
+        $adminrights = "";
+        while ($data2 = dbarray($result2)) {
+            $adminrights .= ($adminrights == "" ? "" : ".") . $data2['admin_rights'];
+        }
+        $result2 = dbquery("UPDATE ".$db_prefix."users SET user_rights = '".$adminrights."' WHERE user_level = 103");
     }
 

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]);
+            }
+        }
     }