Changeset 4330 for trunk/includes/users/capabilities.php

Timestamp:

11/04/2012 02:11:16 AM (13 years ago)

Author:

johnjamesjacoby

Message:

Capabilities:

• Remove advanced capabilities code, template part, and UI helpers.
• This has been replaced by the forums roles selection.
• See #1939.

File:

• trunk/includes/users/capabilities.php (modified) (5 diffs)

trunk/includes/users/capabilities.php

@@ -9 +9 @@
  * @subpackage Capabilities
  */
-
-/**
- * Get the primary bbPress capabilities
- *
- * @since bbPress (r4163)
- *
- * @return array of primary capabilities
- */
-function bbp_get_primary_capabilities() {
-    return apply_filters( 'bbp_get_primary_capabilities', array(
-
-        // Current caps
-        'spectate',
-        'participate',
-        'moderate',
-        'throttle',
-        'view_trash',
-
-        // Legacy caps
-        'banned',
-        'blocked',
-        'bozo'
-    ) );
-}
 
 /**
@@ -70 +46 @@
 
 /**
- * Remove all bbPress capabilities for a given user
- *
- * @since bbPress (r4221)
- *
- * @param int $user_id
- * @return boolean True on success, false on failure
- */
-function bbp_remove_user_caps( $user_id = 0 ) {
-
-    // Bail if no user was passed
-    if ( empty( $user_id ) )
-        return false;
-
-    // Load up the user
-    $user = new WP_User( $user_id );
-
-    // Remove all caps
-    foreach ( bbp_get_capability_groups() as $group )
-        foreach ( bbp_get_capabilities_for_group( $group ) as $capability )
-            $user->remove_cap( $capability );
-
-    // Success
-    return true;
-}
-
-/**
- * Remove all bbPress capabilities for a given user
- *
- * @since bbPress (r4221)
- *
- * @param int $user_id
- * @return boolean True on success, false on failure
- */
-function bbp_reset_user_caps( $user_id = 0 ) {
-
-    // Bail if no user was passed
-    if ( empty( $user_id ) )
-        return false;
-
-    // Bail if current user cannot edit this user
-    if ( ! current_user_can( 'edit_user', $user_id ) )
-        return false;
-
-    // Remove all caps for user
-    bbp_remove_user_caps( $user_id );
-
-    // Load up the user
-    $user = new WP_User( $user_id );
-
-    // User has no role so bail
-    if ( ! isset( $user->roles ) )
-        return false;
-
-    // Use first user role
-    $caps = bbp_get_caps_for_role( array_shift( $user->roles ) );
-
-    // Add caps for the first role
-    foreach ( $caps as $cap => $value )
-        $user->add_cap( $cap, $value );
-
-    // Success
-    return true;
-}
-
-/**
- * Save all bbPress capabilities for a given user
- *
- * @since bbPress (r4221)
- *
- * @param type $user_id
- * @return boolean
- */
-function bbp_save_user_caps( $user_id = 0 ) {
-
-    // Bail if no user was passed
-    if ( empty( $user_id ) )
-        return false;
-
-    // Bail if current user cannot edit this user
-    if ( ! current_user_can( 'edit_user', $user_id ) )
-        return false;
-
-    // Load up the user
-    $user = new WP_User( $user_id );
-
-    // Loop through capability groups
-    foreach ( bbp_get_capability_groups() as $group ) {
-        foreach ( bbp_get_capabilities_for_group( $group ) as $capability ) {
-
-            // Maybe add cap
-            if ( ! empty( $_POST['_bbp_' . $capability] ) && ! $user->has_cap( $capability ) ) {
-                $user->add_cap( $capability, true );
-
-            // Maybe remove cap
-            } elseif ( empty( $_POST['_bbp_' . $capability] ) && $user->has_cap( $capability ) ) {
-                $user->add_cap( $capability, false );
-            }
-        }
-    }
-
-    // Success
-    return true;
-}
-
-/**
  * Helper function hooked to 'bbp_edit_user_profile_update' action to save or
  * update user roles and capabilities.
@@ -184 +55 @@
  * @usse bbp_save_user_caps() to save caps
  */
-function bbp_profile_update_capabilities( $user_id = 0 ) {
+function bbp_profile_update_role( $user_id = 0 ) {
 
     // Bail if no user ID was passed
@@ -190 +61 @@
         return;
 
-    // Bail if advanced capability editor is off
-    if ( ! empty( $_POST['bbp-forums-role'] ) ) {
+    // Bail if no role
+    if ( ! isset( $_POST['bbp-forums-role'] ) )
+        return;
 
-        // Fromus role we want the user to have
-        $new_role    = sanitize_text_field( $_POST['bbp-forums-role'] );
-        $forums_role = bbp_get_user_role( $user_id );
+    // Fromus role we want the user to have
+    $new_role    = sanitize_text_field( $_POST['bbp-forums-role'] );
+    $forums_role = bbp_get_user_role( $user_id );
 
-        // Set the new forums role
-        if ( $new_role != $forums_role ) {
-
-            // Remove any interim form user capabilities
-            bbp_remove_user_caps( $user_id );
-
-            // Set the users new forums role
-            bbp_set_user_role( $user_id, $new_role );
-        }
-    }
-
-    // Save additional capabilities
-    if ( bbp_use_advanced_capability_editor() ) {
-
-        // Either reset caps for role
-        if ( ! empty( $_POST['bbp-default-caps'] ) ) {
-            bbp_reset_user_caps( $user_id );
-
-        // Or set caps individually
-        } else {
-            bbp_save_user_caps( $user_id );
-        }
+    // Set the new forums role
+    if ( $new_role != $forums_role ) {
+        bbp_set_user_role( $user_id, $new_role );
     }
 }
@@ -259 +112 @@
         return;
 
-    // Remove any interim bbPress caps
-    bbp_remove_user_caps( $user_id );
-
     // Assign the default role to the current user
     bbpress()->current_user->add_role( bbp_get_default_role() );