Changeset 4168

Timestamp:

08/24/2012 07:43:39 AM (12 years ago)

Author:

johnjamesjacoby

Message:

Capabilities:

• Remove negative 'blocked' cap and use positive 'participate' cap instead.
• Replaces old 'bbp_participant' role nicely.

File:

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

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

@@ -67 +67 @@
  */
 function bbp_get_general_capabilities() {
-    return apply_filters( 'bbp_get_general_capabilities', array( 
+    return apply_filters( 'bbp_get_general_capabilities', array(
+        'participate',
         'moderate',
         'throttle',
         'view_trash',
-        'bozo',
-        'blocked'
+        'bozo'
     ) );
 }
@@ -84 +84 @@
  */
 function bbp_get_forums_capabilities() {
-    return apply_filters( 'bbp_get_forums_capabilities', array( 
+    return apply_filters( 'bbp_get_forums_capabilities', array(
         'publish_forums',
         'edit_forums',
@@ -103 +103 @@
  */
 function bbp_get_topics_capabilities() {
-    return apply_filters( 'bbp_get_topics_capabilities', array( 
+    return apply_filters( 'bbp_get_topics_capabilities', array(
         'publish_topics',
         'edit_topics',
@@ -121 +121 @@
  */
 function bbp_get_topic_tags_capabilities() {
-    return apply_filters( 'bbp_get_topic_tags_capabilities', array( 
+    return apply_filters( 'bbp_get_topic_tags_capabilities', array(
         'manage_topic_tags',
         'edit_topic_tags',
@@ -137 +137 @@
  */
 function bbp_get_replies_capabilities() {
-    return apply_filters( 'bbp_get_replies_capabilities', array( 
+    return apply_filters( 'bbp_get_replies_capabilities', array(
         'publish_replies',
         'edit_replies',
@@ -221 +221 @@
 
             // Misc
+            case 'participate' :
+                $retval = __( 'Participate in forums', 'bbpress' );
+                break;
             case 'moderate' :
                 $retval = __( 'Moderate entire forum', 'bbpress' );
@@ -232 +235 @@
             case 'bozo' :
                 $retval = __( 'User is a forum bozo', 'bbpress' );
-                break;
-            case 'blocked' :
-                $retval = __( 'User is blocked', 'bbpress' );
                 break;
 
@@ -241 +241 @@
                 $retval = __( 'View forum', 'bbpress' );
                 break;
-
             case 'edit_forum' :
                 $retval = __( 'Edit forum', 'bbpress' );
@@ -613 +612 @@
 function bbp_get_caps_for_role( $role = '' ) {
 
-    // No role
-    if ( empty( $role ) ) {
-        $caps = array(
-            'blocked'
-        );
-
     // Which role are we looking for?
-    } else {
-        switch ( $role ) {
-
-            // Administrator
-            case 'administrator' :
-
-                $caps = array(
-
-                    // Forum caps
-                    'publish_forums',
-                    'edit_forums',
-                    'edit_others_forums',
-                    'delete_forums',
-                    'delete_others_forums',
-                    'read_private_forums',
-                    'read_hidden_forums',
-
-                    // Topic caps
-                    'publish_topics',
-                    'edit_topics',
-                    'edit_others_topics',
-                    'delete_topics',
-                    'delete_others_topics',
-                    'read_private_topics',
-
-                    // Reply caps
-                    'publish_replies',
-                    'edit_replies',
-                    'edit_others_replies',
-                    'delete_replies',
-                    'delete_others_replies',
-                    'read_private_replies',
-
-                    // Topic tag caps
-                    'manage_topic_tags',
-                    'edit_topic_tags',
-                    'delete_topic_tags',
-                    'assign_topic_tags',
-
-                    // Misc
-                    'moderate',
-                    'throttle',
-                    'view_trash'
-                );
-
-                break;
-
-            // Any other role
-            case 'editor'      :
-            case 'author'      :
-            case 'contributor' :
-            case 'subscriber'  :
-            default            :
-                $caps = array(
-
-                    // Forum caps
-                    'read_private_forums',
-
-                    // Topic caps
-                    'publish_topics',
-                    'edit_topics',
-
-                    // Reply caps
-                    'publish_replies',
-                    'edit_replies',
-
-                    // Topic tag caps
-                    'assign_topic_tags'
-                );
-
-                break;
-        }
+    switch ( $role ) {
+
+        // Administrator
+        case 'administrator' :
+
+            $caps = array(
+
+                // Forum caps
+                'publish_forums',
+                'edit_forums',
+                'edit_others_forums',
+                'delete_forums',
+                'delete_others_forums',
+                'read_private_forums',
+                'read_hidden_forums',
+
+                // Topic caps
+                'publish_topics',
+                'edit_topics',
+                'edit_others_topics',
+                'delete_topics',
+                'delete_others_topics',
+                'read_private_topics',
+
+                // Reply caps
+                'publish_replies',
+                'edit_replies',
+                'edit_others_replies',
+                'delete_replies',
+                'delete_others_replies',
+                'read_private_replies',
+
+                // Topic tag caps
+                'manage_topic_tags',
+                'edit_topic_tags',
+                'delete_topic_tags',
+                'assign_topic_tags',
+
+                // Misc
+                'moderate',
+                'throttle',
+                'view_trash'
+            );
+
+            break;
+
+        // Any other role
+        case 'editor'      :
+        case 'author'      :
+        case 'contributor' :
+        case 'subscriber'  :
+        default            :
+            $caps = array(
+
+                // General caps
+                'participate',
+
+                // Forum caps
+                'read_private_forums',
+
+                // Topic caps
+                'publish_topics',
+                'edit_topics',
+
+                // Reply caps
+                'publish_replies',
+                'edit_replies',
+
+                // Topic tag caps
+                'assign_topic_tags'
+            );
+
+            break;
     }
 
@@ -799 +793 @@
  * @since bbPress (r3944)
  *
+ * @todo use meta caps and maybe deprecate
  * @uses current_user_can() To check the 'moderate' capability
  * @uses bbp_get_forum_post_type()