Changeset 4349 for trunk/includes/topics/capabilities.php

Timestamp:

11/07/2012 08:04:06 AM (13 years ago)

Author:

johnjamesjacoby

Message:

Capabilities:

• Remove most capability mappings to 'participate' cap.
• Update bbp_set_current_user_default_role() to dynamically map a logged in user if global access is turned off.
• Provides alternative to users being granted a database role without taking any action.
• This makes bbPress work similarly to comments, though a decision needs to be made regarding profile pages for these "anonymous" users.

File:

• trunk/includes/topics/capabilities.php (modified) (8 diffs)

trunk/includes/topics/capabilities.php

@@ -3 +3 @@
 /**
  * bbPress Topic Capabilites
- * 
+ *
  * Used to map topic capabilities to WordPress's existing capabilities.
  *
@@ -71 +71 @@
 
             // User cannot participate
-            if ( ! user_can( $user_id, 'participate' ) ) {
+            if ( ! user_can( $user_id, 'spectate' ) ) {
                 $caps = array( 'do_not_allow' );
 
             // Do some post ID based logic
             } else {
-            
+
                 // Get the post
                 $_post = get_post( $args[0] );
@@ -86 +86 @@
                     // Post is public
                     if ( bbp_get_public_status_id() == $_post->post_status ) {
-                        $caps = array( 'particpate' );
+                        $caps = array( 'spectate' );
 
                     // User is author so allow read
                     } elseif ( (int) $user_id == (int) $_post->post_author ) {
-                        $caps = array( 'participate' );
+                        $caps = array( 'spectate' );
 
                     // Unknown so map to private posts
@@ -105 +105 @@
         case 'publish_topics'  :
 
-            // Non participants cannot participate
-            if ( ! user_can( $user_id, 'participate' ) ) {
-                $caps = array( 'do_not_allow' );
-
             // Moderators can always publish
-            } elseif ( user_can( $user_id, 'moderate' ) ) {
-                $caps = array( $cap );
+            if ( user_can( $user_id, 'moderate' ) ) {
+                $caps = array( 'moderate' );
             }
 
@@ -122 +118 @@
         case 'edit_others_topics' :
 
-            // Non participants cannot manage content
-            if ( ! user_can( $user_id, 'participate' ) ) {
-                $caps = array( 'do_not_allow' );
-
             // Moderators can always edit
-            } elseif ( user_can( $user_id, 'moderate' ) ) {
+            if ( user_can( $user_id, 'moderate' ) ) {
                 $caps = array( $cap );
             }
@@ -178 +170 @@
                 // Moderators can always edit forum content
                 } elseif ( user_can( $user_id, 'moderate' ) ) {
-                    $caps[] = 'participate';
+                    $caps[] = 'moderate';
 
                 // Unknown so map to delete_others_posts
@@ -187 +179 @@
 
             break;
-            
+
         // Moderation override
         case 'delete_topics'         :
         case 'delete_others_topics'  :
 
-            // Non participants cannot manage content
-            if ( ! user_can( $user_id, 'participate' ) ) {
-                $caps = array( 'do_not_allow' );
-
             // Moderators can always delete
-            } elseif ( user_can( $user_id, 'moderate' ) ) {
+            if ( user_can( $user_id, 'moderate' ) ) {
                 $caps = array( $cap );
             }
 
             break;
-            
+
         /** Admin *************************************************************/
 
@@ -229 +217 @@
     // What capability is being checked?
     switch ( $cap ) {
-        case 'manage_topic_tags' :
-        case 'edit_topic_tags'   :
-        case 'delete_topic_tags' :
-        case 'assign_topic_tags' :
-
-            // Non participants cannot manage content
-            if ( ! user_can( $user_id, 'participate' ) ) {
-                $caps = array( 'do_not_allow' );
+        case 'manage_topic_tags'    :
+        case 'edit_topic_tags'      :
+        case 'delete_topic_tags'    :
+        case 'assign_topic_tags'    :
+        case 'bbp_topic_tags_admin' :
 
             // Moderators can always edit
-            } elseif ( user_can( $user_id, 'moderate' ) ) {
-                $caps = array( $cap );
-            }
-
-            break;
-
-        case 'bbp_topic_tags_admin' :
-            $caps = array( 'moderate' );
+            if ( user_can( $user_id, 'moderate' ) ) {
+                $caps = array( 'moderate' );
+            }
     }