Changeset 3536

Timestamp:

02/17/2006 12:57:10 AM (19 years ago)

Author:

ryan

Message:

Dynamic menu reparenting. fixes #2257

Location:

trunk/wp-admin

Files:

• admin-functions.php (modified) (5 diffs)
• menu-header.php (modified) (1 diff)
• menu.php (modified) (1 diff)

trunk/wp-admin/admin-functions.php

@@ -1232 +1232 @@
     global $menu;
     global $submenu;
+    global $menu_nopriv;
 
     $parent = get_admin_page_parent();
+    
+    if ( isset($menu_nopriv[$pagenow]) )
+        return false;
+
+    if ( empty($parent) )
+        return true;
+
+    if (isset ($submenu[$parent])) {
+        foreach ($submenu[$parent] as $submenu_array) {
+            if ($submenu_array[2] == $pagenow) {
+                if (current_user_can($submenu_array[1]))
+                    return true;
+                else
+                    return false;
+            }
+        }
+    }
 
     foreach ($menu as $menu_array) {
         //echo "parent array: " . $menu_array[2];
         if ($menu_array[2] == $parent) {
-            if (!current_user_can($menu_array[1])) {
+            if (current_user_can($menu_array[1]))
+                return true;
+            else
                 return false;
-            } else {
-                break;
-            }
-        }
-    }
-
-    if (isset ($submenu[$parent])) {
-        foreach ($submenu[$parent] as $submenu_array) {
-            if ($submenu_array[2] == $pagenow) {
-                if (!current_user_can($submenu_array[1])) {
-                    return false;
-                } else {
-                    return true;
-                }
-            }
-        }
-    }
-
+        }
+    }
+    
     return true;
 }
@@ -1314 +1319 @@
     global $pagenow;
     global $plugin_page;
-
-    if (isset ($parent_file) && !empty ($parent_file)) {
+    global $real_parent_file;
+
+    if ( !empty ($parent_file) ) {
+        if ( isset($real_parent_file[$parent_file]) )
+            $parent_file = $real_parent_file[$parent_file];
+
         return $parent_file;
     }
@@ -1323 +1332 @@
             if ($parent_menu[2] == $plugin_page) {
                 $parent_file = $plugin_page;
-                return $plugin_page;
+                if ( isset($real_parent_file[$parent_file]) )
+                    $parent_file = $real_parent_file[$parent_file];
+                    
+                return $parent_file;
             }
         }
@@ -1330 +1342 @@
     foreach (array_keys($submenu) as $parent) {
         foreach ($submenu[$parent] as $submenu_array) {
+            if ( isset($real_parent_file[$parent]) )
+                $parent = $real_parent_file[$parent];
             if ($submenu_array[2] == $pagenow) {
                 $parent_file = $parent;
@@ -1364 +1378 @@
     global $submenu;
     global $menu;
+    global $real_parent_file;
 
     $parent = plugin_basename($parent);
+    if ( isset($real_parent_file[$parent]) )
+        $parent = $real_parent_file[$parent];
+
     $file = plugin_basename($file);
 

trunk/wp-admin/menu-header.php

@@ -12 +12 @@
     if (( strcmp($self, $item[2]) == 0 && empty($parent_file)) || ($parent_file && ($item[2] == $parent_file))) $class = ' class="current"';
     
-    if ( current_user_can($item[1]) ) {
+    if ( !empty($submenu[$item[2]]) || current_user_can($item[1]) ) {
         if ( file_exists(ABSPATH . "wp-content/plugins/{$item[2]}") )
             echo "\n\t<li><a href='" . get_settings('siteurl') . "/wp-admin/admin.php?page={$item[2]}'$class>{$item[0]}</a></li>";

trunk/wp-admin/menu.php

@@ -50 +50 @@
 $submenu['themes.php'][10] = array(__('Theme Editor'), 'edit_themes', 'theme-editor.php');
 
+// Loop over submenus and remove pages for which the user does not have privs.
+foreach ($submenu as $parent => $sub) {
+    foreach ($sub as $index => $data) {
+        if ( ! current_user_can($data[1]) ) {
+            $menu_nopriv[$data[2]] = true;
+            unset($submenu[$parent][$index]);
+        }
+    }
+    
+    if ( empty($submenu[$parent]) )
+        unset($submenu[$parent]);
+}
+
+// Loop over the top-level menu.
+// Remove menus that have no accessible submenus and require privs that the user does not have.
+// Menus for which the original parent is not acessible due to lack of privs will have the next
+// submenu in line be assigned as the new menu parent. 
+foreach ( $menu as $id => $data ) {
+    // If submenu is empty...
+    if ( empty($submenu[$data[2]]) ) {
+        // And user doesn't have privs, remove menu.
+        if ( ! current_user_can($data[1]) ) {
+            $menu_nopriv[$data[2]] = true;
+            unset($menu[$id]);
+        }
+    } else {
+        $subs = $submenu[$data[2]];
+        $first_sub = array_shift($subs);
+        $old_parent = $data[2];
+        $new_parent = $first_sub[2];
+        // If the first submenu is not the same as the assigned parent,
+        // make the first submenu the new parent.
+        if ( $new_parent != $old_parent ) {
+            $real_parent_file[$old_parent] = $new_parent;
+            $menu[$id][2] = $new_parent;
+            
+            foreach ($submenu[$old_parent] as $index => $data) {
+                $submenu[$new_parent][$index] = $submenu[$old_parent][$index];
+                unset($submenu[$old_parent][$index]);
+            }
+            unset($submenu[$old_parent]);   
+        }
+    }
+}
+
 // Create list of page plugin hook names.
 foreach ($menu as $menu_page) {