Changeset 5829 for trunk/bp-settings/bp-settings-loader.php

Timestamp:

02/23/2012 06:18:39 AM (13 years ago)

Author:

johnjamesjacoby

Message:

First pass at adding user capabilities screen and action to settings component:

• Add capabilities template
• Unhook core spammer and deleted user actions and move to settings
• Route admin bar links appropriately to new locations
• Allow delete-account to be accessed by super admins in place of broken alerts
• Improve general settings feedback
• @todo - backpat post mortem
• See #4038

File:

• trunk/bp-settings/bp-settings-loader.php (modified) (6 diffs)

trunk/bp-settings/bp-settings-loader.php

@@ -50 +50 @@
      *
      * @since 1.5
-     * @global obj $bp
      */
     function setup_globals() {
@@ -69 +68 @@
     /**
      * Setup BuddyBar navigation
-     *
-     * @global obj $bp
      */
     function setup_nav() {
-        global $bp;
 
         // Define local variable
@@ -84 +80 @@
             'position'                => 100,
             'show_for_displayed_user' => bp_core_can_edit_settings(),
-            'screen_function'         => 'bp_core_screen_general_settings',
+            'screen_function'         => 'bp_settings_screen_general',
             'default_subnav_slug'     => 'general'
         );
@@ -104 +100 @@
             'parent_url'      => $settings_link,
             'parent_slug'     => $this->slug,
-            'screen_function' => 'bp_core_screen_general_settings',
+            'screen_function' => 'bp_settings_screen_general',
             'position'        => 10,
             'user_has_access' => bp_core_can_edit_settings()
@@ -115 +111 @@
             'parent_url'      => $settings_link,
             'parent_slug'     => $this->slug,
-            'screen_function' => 'bp_core_screen_notification_settings',
+            'screen_function' => 'bp_settings_screen_notification',
             'position'        => 20,
             'user_has_access' => bp_core_can_edit_settings()
         );
 
+        // Add Spam Account nav item
+        if ( bp_current_user_can( 'bp_moderate' ) ) {
+            $sub_nav[] = array(
+                'name'            => __( 'Capabilities', 'buddypress' ),
+                'slug'            => 'capabilities',
+                'parent_url'      => $settings_link,
+                'parent_slug'     => $this->slug,
+                'screen_function' => 'bp_settings_screen_capabilities',
+                'position'        => 80,
+                'user_has_access' => ! bp_is_my_profile()
+            );
+        }
+
         // Add Delete Account nav item
-        if ( !bp_current_user_can( 'bp_moderate' ) && empty( $bp->site_options['bp-disable-account-deletion'] ) ) {
+        if ( ! bp_disable_account_deletion() ) {
             $sub_nav[] = array(
                 'name'            => __( 'Delete Account', 'buddypress' ),
@@ -127 +136 @@
                 'parent_url'      => $settings_link,
                 'parent_slug'     => $this->slug,
-                'screen_function' => 'bp_core_screen_delete_account',
+                'screen_function' => 'bp_settings_screen_delete_account',
                 'position'        => 90,
-                'user_has_access' => bp_is_my_profile()
+                'user_has_access' => bp_is_my_profile() || !is_super_admin( bp_displayed_user_id() )
             );
         }