Changeset 4308

Timestamp:

11/02/2012 07:58:46 PM (12 years ago)

Author:

johnjamesjacoby

Message:

Capabilities:

• Update bbp_profile_update_capabilities() to include saving forums roles.
• When saving a role, remove any individual forums capabilities that were set.
• Add some legacy caps to primary group, so they are correctly removed.
• See #1939.

File:

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

trunk/includes/users/capabilities.php

@@ -19 +19 @@
 function bbp_get_primary_capabilities() {
     return apply_filters( 'bbp_get_primary_capabilities', array(
+
+        // Current caps
+        'spectate',
         'participate',
         'moderate',
         'throttle',
-        'view_trash'
+        'view_trash',
+
+        // Legacy caps
+        'banned',
+        'blocked',
+        'bozo'
     ) );
 }
@@ -43 +51 @@
     switch ( $cap ) {
 
-        /**
-         * The 'participate' capability is similar to WordPress's 'read' cap,
-         * in that it is the minimum required cap to perform any other bbPress
-         * related thing.
-         */
+        // Minimum required cap to read any forum content
+        case 'spectate' :
+
+        // Minimum required cap to create any forum content
         case 'participate' :
 
@@ -64 +71 @@
 
             break;
-            
+
         case 'moderate' :
 
@@ -136 +143 @@
 
     // Add caps for the first role
-    foreach ( $caps as $cap )
-        $user->add_cap( $cap, true );
+    foreach ( $caps as $cap => $value )
+        $user->add_cap( $cap, $value );
 
     // Success
@@ -193 +200 @@
  * @usse bbp_save_user_caps() to save caps
  */
-function bbp_edit_user_profile_update_capabilities( $user_id = 0 ) {
+function bbp_profile_update_capabilities( $user_id = 0 ) {
 
     // Bail if no user ID was passed
@@ -199 +206 @@
         return;
 
-    // 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 );
+    // Bail if advanced capability editor is off
+    if ( ! empty( $_POST['bbp-forums-role'] ) ) {
+
+        // Fromus role we want the user to have
+        $new_role    = stripslashes( $_POST['bbp-forums-role'] );
+        $forums_role = bbp_get_user_role( $user_id );
+
+        // Set the new forums role
+        if ( $new_role != $forums_role ) {
+            bbp_set_user_role( $user_id, $new_role );
+        }
+
+        // Remove any interim form user capabilities
+        bbp_remove_user_caps( $user_id );
+    }
+
+    // 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 );
+        }
     }
 }
@@ -240 +267 @@
 
     // Assign the default role to the current user
-    bbpress()->current_user->set_role( get_option( 'default_role', 'subscriber' ) );
-}
+    bbpress()->current_user->add_role( bbp_get_default_role() );
+}