Changeset 4184

Timestamp:

09/04/2012 08:31:57 AM (13 years ago)

Author:

johnjamesjacoby

Message:

Capabilities:

• Bring back bbp_add_caps() and bbp_remove_caps().
• Remove role mask, and more aggressively add registered user to site with default role when user visits the site for the first time.
• See #1942.

File:

• branches/plugin/bbp-includes/bbp-core-caps.php (modified) (5 diffs)

branches/plugin/bbp-includes/bbp-core-caps.php ¶

@@ -10 +10 @@
 // Exit if accessed directly
 if ( !defined( 'ABSPATH' ) ) exit;
+
+/**
+ * Adds capabilities to WordPress user roles.
+ *
+ * @since bbPress (r2608)
+ */
+function bbp_add_caps() {
+    global $wp_roles;
+
+    // Load roles if not set
+    if ( ! isset( $wp_roles ) )
+        $wp_roles = new WP_Roles();
+
+    // Loop through available roles and add caps
+    foreach( $wp_roles->role_objects as $role ) {
+        foreach ( bbp_get_caps_for_role( $role->name ) as $cap ) {
+            $role->add_cap( $cap );
+        }
+    }
+
+    do_action( 'bbp_add_caps' );
+}
+
+/**
+ * Removes capabilities from WordPress user roles.
+ *
+ * @since bbPress (r2608)
+ */
+function bbp_remove_caps() {
+    global $wp_roles;
+
+    // Load roles if not set
+    if ( ! isset( $wp_roles ) )
+        $wp_roles = new WP_Roles();
+
+    // Loop through available roles and remove caps
+    foreach( $wp_roles->role_objects as $role ) {
+        foreach ( bbp_get_caps_for_role( $role->name ) as $cap ) {
+            $role->remove_cap( $cap );
+        }
+    }
+
+    do_action( 'bbp_remove_caps' );
+}
 
 /**
@@ -707 +751 @@
 
 /**
- * Give a user the default role when creating a topic/reply on a site they do
- * not have a role on.
- *
- * @since bbPress (r3410)
- *
- * @uses bbp_allow_global_access()
- * @uses bbp_is_user_inactive()
- * @uses is_user_logged_in()
- * @uses current_user_can()
- * @uses WP_User::set_role()
- *
- * @return If user is not spam/deleted or is already capable
- */
-function bbp_global_access_auto_role() {
-
-    // Bail if forum is not global
-    if ( ! bbp_allow_global_access() )
-        return;
-
-    // Bail if not logged in or already a member of this site
-    if ( ! is_user_logged_in() || is_user_member_of_blog() )
-        return;
-
-    // Bail if user is not active
-    if ( bbp_is_user_inactive() )
-        return;
-
-    // Give the user the default role
-    if ( ! current_user_can( 'bbp_masked' ) )
-        return;
-
-    // Make sure the bbp_masked cap doesn't get saved to the DB
-    bbpress()->current_user->remove_cap( 'bbp_masked' );
-
-    // Set user to default role for blog
-    bbpress()->current_user->set_role( get_option( 'default_role', 'subscriber' ) );
-}
-
-/**
  * Add the default role and mapped bbPress caps to the current user if needed
  *
@@ -781 +786 @@
         return;
 
-    // Set all caps to true
-    foreach ( bbp_get_caps_for_role() as $cap )
-        $default_caps[$cap] = true;
-
-    // Add 'read' cap just in case
-    $default_caps['bbp_masked'] = true;
-
-    // Allow global access caps to be manipulated
-    $default_caps = apply_filters( 'bbp_global_access_default_caps', $default_caps );
-
     // Assign the role and mapped caps to the current user
-    $bbp = bbpress();
-    $bbp->current_user->caps     = $default_caps;
-    $bbp->current_user->allcaps  = $default_caps;
+    bbpress()->current_user->set_role( get_option( 'default_role', 'subscriber' ) );
 }
 
@@ -850 +843 @@
         case 'bbp_tools_import_page'     : // Tools - Import Page
         case 'bbp_tools_reset_page'      : // Tools - Reset Page
-        case 'bbp_settings?page'         : // Settings Page
+        case 'bbp_settings_page'         : // Settings Page
         case 'bbp_settings_main'         : // Settings - General
         case 'bbp_settings_theme_compat' : // Settings - Theme compat
@@ -888 +881 @@
 
 /**
- * Adds capabilities to WordPress user roles.
- *
- * @since bbPress (r2608)
- * @deprecated since version 2.2
- */
-function bbp_add_caps() {
-    _doing_it_wrong( 'bbp_add_caps', __( 'Use mapped capabilities instead', 'bbpress' ), '2.2' );
-}
-
-/**
- * Removes capabilities from WordPress user roles.
- *
- * @since bbPress (r2608)
- * @deprecated since version 2.2
- */
-function bbp_remove_caps() {
-    _doing_it_wrong( 'bbp_remove_caps', __( 'Special forum roles no longer exist. Use mapped capabilities instead', 'bbpress' ), '2.2' );
-}
-
-/**
  * The anonymous role for unregistered users
  *