Changeset 2348

Timestamp:

08/12/2009 05:03:05 AM (17 years ago)

Author:

sambauers

Message:

branches 0.9: Maintain registry of valid plugin page callbacks. See #1172.

Location:

branches/0.9/bb-admin

Files:

• admin-functions.php (modified) (2 diffs)
• admin.php (modified) (1 diff)

branches/0.9/bb-admin/admin-functions.php

@@ -77 +77 @@
 {
         global $bb_menu;
+        global $bb_registered_plugin_callbacks;
+        if ( empty( $bb_registered_plugin_callbacks ) ) {
+                $bb_registered_plugin_callbacks = array();
+        }
+
         if ($display_name && $capability && $file_name) {
+                if ( strpos( $file_name, '.php' ) === false ) {
+                        $bb_registered_plugin_callbacks[] = $file_name;
+                }
                 $bb_menu[] = array($display_name, $capability, $file_name);
         }
@@ -85 +93 @@
 {
         global $bb_submenu;
+        global $bb_registered_plugin_callbacks;
+        if ( empty( $bb_registered_plugin_callbacks ) ) {
+                $bb_registered_plugin_callbacks = array();
+        }
+
         if ($display_name && $capability && $file_name) {
+                if ( strpos( $file_name, '.php' ) === false ) {
+                        $bb_registered_plugin_callbacks[] = $file_name;
+                }
                 $bb_submenu[$parent][] = array($display_name, $capability, $file_name);
         }

branches/0.9/bb-admin/admin.php

@@ -13 +13 @@
 require('admin-functions.php');
 
-if ( isset($_GET['plugin']) )
-        $bb_admin_page = $_GET['plugin'];
-else    $bb_admin_page = bb_find_filename($_SERVER['PHP_SELF']);
+$bb_admin_page = bb_find_filename( $_SERVER['PHP_SELF'] );
+
+$_check_callback = false;
+if ( $bb_admin_page == 'admin-base.php' ) {
+        $bb_admin_page = (string) @$_GET['plugin'];
+        $_check_callback = true;
+}
 
 bb_admin_menu_generator();
 bb_get_current_admin_menu();
+
+if ( $_check_callback ) {
+        if ( empty( $bb_registered_plugin_callbacks ) || empty( $bb_admin_page ) || !in_array( $bb_admin_page, $bb_registered_plugin_callbacks ) ) {
+                unset( $bb_admin_page );
+        }
+}
 ?>