Changeset 6274 for trunk/src/includes/admin/admin.php

Timestamp:

02/02/2017 11:08:01 PM (9 years ago)

Author:

johnjamesjacoby

Message:

Tools: Unify the tab/link experience:

• Introduce function to get tools pages
• Trust capability checks in core WordPress functions, and remove our own bespoke pre-checks
• Add tool-box to wp-admin/tools.php linking to tools the user has access to

This change promotes exposure to bbPress's tools pages, and makes adding third-party tools pages easier.

See: #2959.

File:

• trunk/src/includes/admin/admin.php (modified) (3 diffs)

trunk/src/includes/admin/admin.php

@@ -202 +202 @@
         $hooks = array();
 
-        // These are later removed in admin_head
-        if ( current_user_can( 'bbp_tools_page' ) ) {
-            if ( current_user_can( 'bbp_tools_repair_page' ) ) {
-                $hooks[] = add_management_page(
-                    __( 'Repair Forums', 'bbpress' ),
-                    __( 'Forum Repair',  'bbpress' ),
-                    $this->minimum_capability,
-                    'bbp-repair',
-                    'bbp_admin_repair'
-                );
+        // Get the tools pages
+        $tools = bbp_get_tools_admin_pages();
+
+        // Loop through tools and check
+        foreach ( $tools as $tool ) {
+
+            // Try to add the admin page
+            $page = add_management_page(
+                $tool['name'],
+                $tool['name'],
+                $tool['cap'],
+                $tool['page'],
+                $tool['func']
+            );
+
+            // Add page to hook if user can view it
+            if ( false !== $page ) {
+                $hooks[] = $page;
             }
-
-            if ( current_user_can( 'bbp_tools_import_page' ) ) {
-                $hooks[] = add_management_page(
-                    __( 'Import Forums', 'bbpress' ),
-                    __( 'Forum Import',  'bbpress' ),
-                    $this->minimum_capability,
-                    'bbp-converter',
-                    'bbp_converter_settings'
-                );
-            }
-
-            if ( current_user_can( 'bbp_tools_reset_page' ) ) {
-                $hooks[] = add_management_page(
-                    __( 'Reset Forums', 'bbpress' ),
-                    __( 'Forum Reset',  'bbpress' ),
-                    $this->minimum_capability,
-                    'bbp-reset',
-                    'bbp_admin_reset'
-                );
-            }
-
-            // Fudge the highlighted subnav item when on a bbPress admin page
-            foreach ( $hooks as $hook ) {
-                add_action( "admin_head-$hook", 'bbp_tools_modify_menu_highlight' );
-            }
-
-            // Forums Tools Root
-            add_management_page(
-                __( 'Forums', 'bbpress' ),
-                __( 'Forums', 'bbpress' ),
-                $this->minimum_capability,
-                'bbp-repair',
-                'bbp_admin_repair'
-            );
-        }
+        }
+
+        // Fudge the highlighted subnav item when on a bbPress admin page
+        foreach ( $hooks as $hook ) {
+            add_action( "admin_head-{$hook}", 'bbp_tools_modify_menu_highlight' );
+        }
+
+        // Forums Tools Root
+        add_management_page(
+            __( 'Forums', 'bbpress' ),
+            __( 'Forums', 'bbpress' ),
+            'bbp_tools_page',
+            'bbp-repair',
+            'bbp_admin_repair'
+        );
 
         // Are settings enabled?
-        if ( ! bbp_settings_integration() && current_user_can( 'bbp_settings_page' ) ) {
+        if ( ! bbp_settings_integration() ) {
             add_options_page(
                 __( 'Forums',  'bbpress' ),
                 __( 'Forums',  'bbpress' ),
-                $this->minimum_capability,
+                'bbp_settings_page',
                 'bbpress',
                 'bbp_admin_settings'
@@ -267 +255 @@
                 __( 'Welcome to bbPress',  'bbpress' ),
                 __( 'Welcome to bbPress',  'bbpress' ),
-                $this->minimum_capability,
+                'bbp_about_page',
                 'bbp-about',
                 array( $this, 'about_screen' )
@@ -276 +264 @@
                 __( 'Welcome to bbPress',  'bbpress' ),
                 __( 'Welcome to bbPress',  'bbpress' ),
-                $this->minimum_capability,
+                'bbp_about_page',
                 'bbp-credits',
                 array( $this, 'credits_screen' )