Changeset 2783

Timestamp:

01/09/2011 09:41:41 AM (15 years ago)

Author:

johnjamesjacoby

Message:

Map read_ caps for forums/topics/replies. Also revert r2779 since we remove the moderator role completely. Props GautamGupta via Google Code-in

File:

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

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

@@ -179 +179 @@
         $admin->remove_cap( 'throttle'              );
         $admin->remove_cap( 'view_trash'            );
-    }
-
-    // Remove caps from moderator role
-    if ( $mod =& get_role( 'bbp_moderator' ) ) {
-
-        // Topic caps
-        $mod->remove_cap( 'publish_topics'        );
-        $mod->remove_cap( 'edit_topics'           );
-        $mod->remove_cap( 'edit_others_topics'    );
-        $mod->remove_cap( 'delete_topics'         );
-        $mod->remove_cap( 'delete_others_topics'  );
-        $mod->remove_cap( 'read_private_topics'   );
-
-        // Reply caps
-        $mod->remove_cap( 'publish_replies'       );
-        $mod->remove_cap( 'edit_replies'          );
-        $mod->remove_cap( 'edit_others_replies'   );
-        $mod->remove_cap( 'delete_replies'        );
-        $mod->remove_cap( 'delete_others_replies' );
-        $mod->remove_cap( 'read_private_replies'  );
-
-        // Topic tag caps
-        $mod->remove_cap( 'manage_topic_tags'     );
-        $mod->remove_cap( 'edit_topic_tags'       );
-        $mod->remove_cap( 'delete_topic_tags'     );
-        $mod->remove_cap( 'assign_topic_tags'     );
-
-        // Users
-        $mod->remove_cap( 'edit_users'            );
-
-        // Misc
-        $mod->remove_cap( 'moderate'              );
-        $mod->remove_cap( 'throttle'              );
-        $mod->remove_cap( 'view_trash'            );
     }
 
@@ -268 +234 @@
 
     switch ( $cap ) {
+        case 'read_forum' :
+        case 'read_topic' :
+        case 'read_reply' :
+
+            if ( $post = get_post( $args[0] ) ) {
+                $caps      = array();
+                $post_type = get_post_type_object( $post->post_type );
+
+                if ( 'private' != $post->post_status )
+                    $caps[] = 'read';
+                elseif ( (int) $user_id == (int) $post->post_author )
+                    $caps[] = 'read';
+                else
+                    $caps[] = $post_type->cap->read_private_posts;
+            }
+
+            break;
+
         case 'edit_forum' :
         case 'edit_topic' :
@@ -276 +260 @@
                 $post_type = get_post_type_object( $post->post_type );
 
-                if ( (int)$user_id == (int)$post->post_author )
+                if ( (int) $user_id == (int) $post->post_author )
                     $caps[] = $post_type->cap->edit_posts;
                 else
@@ -290 +274 @@
                 $post_type = get_post_type_object( $post->post_type );
 
-                if ( (int)$user_id == (int) $post->post_author )
+                if ( (int) $user_id == (int) $post->post_author )
                     $caps[] = $post_type->cap->delete_posts;
                 else