Ticket #785: plugin_page_hooks.diff

admin-functions.php

@@ -773 +773 @@
-}
-
-function add_menu_page($page_title, $menu_title, $access_level, $file) {
-
+, $admin_page_hooks
-
-        $file = plugin_basename($file);
-
-        $menu[] = array($menu_title, $access_level, $file, $page_title);
+
+        $admin_page_hooks[$file] = sanitize_title($menu_title);
-}
-
-
+, $function = ''
-        global $submenu;
-        global $menu;
-
@@ -800 +802 @@
-        }
-        
-        $submenu[$parent][] = array($menu_title, $access_level, $file, $page_title);
+
+        $hookname = get_plugin_page_hookname($file, $parent);
+        if ( !empty($function) && !empty($hookname) )
+                add_action($hookname, $function);
+
+        return $hookname;
-}
-
-
-add_submenu_page('options-general.php', $page_title, $menu_title, $access_level, $file
+, $function = ''
+return add_submenu_page('options-general.php', $page_title, $menu_title, $access_level, $file, $function
-}
-
-
-add_submenu_page('edit.php', $page_title, $menu_title, $access_level, $file
+, $function = ''
+return add_submenu_page('edit.php', $page_title, $menu_title, $access_level, $file, $function
-}
-
-function validate_file($file, $allowed_files = '') {
@@ -999 +1007 @@
-        return $wp_plugins;
-}
-
+function get_plugin_page_hookname($plugin_page, $parent_page) {
+        global $admin_page_hooks;
+
+        if ( isset($admin_page_hooks[$parent_page]) )
+                $page_type = $admin_page_hooks[$parent_page];
+        else
+                $page_type = 'admin';
+
+        $plugin_name = preg_replace('!\.php!', '', $plugin_page);
+
+        return $page_type . '_page_' . $plugin_name;
+}
+
+function get_plugin_page_hook($plugin_page, $parent_page) {
+        global $wp_filter;
+
+        $hook = get_plugin_page_hookname($plugin_page, $parent_page);
+
+        if ( isset($wp_filter[$hook]) )
+                return $hook;
+        else
+                return '';
+}
+
-?>

admin.php

@@ -41 +41 @@
-// Handle plugin admin pages.
-if (isset($_GET['page'])) {
-        $plugin_page = plugin_basename($_GET['page']);
-
-
-
-
-
-
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
-
-include(ABSPATH . 'wp-admin/admin-footer.php');        
+exit();
-}
-
-?>

menu-header.php

@@ -35 +35 @@
-                 continue;
-         }
-
-substr($self, -10) == substr($item[2], -10)) || (isset($plugin_page) && $plugin_page == $item[2]
+isset($plugin_page) && $plugin_page == $item[2]) || (!isset($plugin_page) && substr($self, -10) == substr($item[2], -10)
-else if (isset($submenu_file) && $submenu_file == substr($item[2], -10)) $class = ' class="current"';    
-else $class = '';
-
-
-
-
+
+
+
+
+
+
+
-        echo "\n\t<li><a href='" . get_settings('siteurl') . "/wp-admin/{$item[2]}'$class>{$item[0]}</a></li>";
+ }
-endforeach;
-?>
-

menu.php

@@ -48 +48 @@
-$submenu['themes.php'][5] = array(__('Themes'), 8, 'themes.php');
-$submenu['themes.php'][10] = array(__('Theme Editor'), 8, 'theme-editor.php');
-
+// Create list of page plugin hook names.
+foreach ($menu as $menu_page) {
+        $admin_page_hooks[$menu_page[2]] = sanitize_title($menu_page[0]);
+}
+
-do_action('admin_menu', '');
-ksort($menu); // make it all pretty
-