Changeset 4313

Timestamp:

11/03/2012 07:15:09 AM (14 years ago)

Author:

johnjamesjacoby

Message:

Capabilities:

• Add 'blocked' capability for Blocked role.
• See #1939.

File:

• trunk/includes/core/capabilities.php (modified) (6 diffs)

trunk/includes/core/capabilities.php

@@ -161 +161 @@
                                 $retval = __( 'Skip forum throttle check', 'bbpress' );
                                 break;
+                        case 'blocked' :
+                                $retval = __( 'Block access to all forums', 'bbpress' );
+                                break;
                         case 'view_trash' :
                                 $retval = __( 'View items in forum trash', 'bbpress' );
@@ -309 +312 @@
                 // Keymaster
                 case bbp_get_keymaster_role() :
-                        $caps = array(
-
-                                // Primary caps
-                                'spectate'               => true,
-                                'participate'            => true,
-                                'moderate'               => true,
-                                'throttle'               => true,
-                                'view_trash'             => true,
-
-                                // Forum caps
-                                'publish_forums'         => true,
-                                'edit_forums'            => true,
-                                'edit_others_forums'     => true,
-                                'delete_forums'          => true,
-                                'delete_others_forums'   => true,
-                                'read_private_forums'    => true,
-                                'read_hidden_forums'     => true,
-
-                                // Topic caps
-                                'publish_topics'         => true,
-                                'edit_topics'            => true,
-                                'edit_others_topics'     => true,
-                                'delete_topics'          => true,
-                                'delete_others_topics'   => true,
-                                'read_private_topics'    => true,
-
-                                // Reply caps
-                                'publish_replies'        => true,
-                                'edit_replies'           => true,
-                                'edit_others_replies'    => true,
-                                'delete_replies'         => true,
-                                'delete_others_replies'  => true,
-                                'read_private_replies'   => true,
-
-                                // Topic tag caps
-                                'manage_topic_tags'      => true,
-                                'edit_topic_tags'        => true,
-                                'delete_topic_tags'      => true,
-                                'assign_topic_tags'      => true
-                        );
-
-                        break;
-
-                // Moderator
-                case bbp_get_moderator_role() :
                         $caps = array(
 
@@ -361 +319 @@
                                 'moderate'              => true,
                                 'throttle'              => true,
+                                'blocked'               => false,
+                                'view_trash'            => true,
+
+                                // Forum caps
+                                'publish_forums'        => true,
+                                'edit_forums'           => true,
+                                'edit_others_forums'    => true,
+                                'delete_forums'         => true,
+                                'delete_others_forums'  => true,
+                                'read_private_forums'   => true,
+                                'read_hidden_forums'    => true,
+
+                                // Topic caps
+                                'publish_topics'        => true,
+                                'edit_topics'           => true,
+                                'edit_others_topics'    => true,
+                                'delete_topics'         => true,
+                                'delete_others_topics'  => true,
+                                'read_private_topics'   => true,
+
+                                // Reply caps
+                                'publish_replies'       => true,
+                                'edit_replies'          => true,
+                                'edit_others_replies'   => true,
+                                'delete_replies'        => true,
+                                'delete_others_replies' => true,
+                                'read_private_replies'  => true,
+
+                                // Topic tag caps
+                                'manage_topic_tags'     => true,
+                                'edit_topic_tags'       => true,
+                                'delete_topic_tags'     => true,
+                                'assign_topic_tags'     => true
+                        );
+
+                        break;
+
+                // Moderator
+                case bbp_get_moderator_role() :
+                        $caps = array(
+
+                                // Primary caps
+                                'spectate'              => true,
+                                'participate'           => true,
+                                'moderate'              => true,
+                                'throttle'              => true,
+                                'blocked'               => false,
                                 'view_trash'            => false,
 
@@ -406 +411 @@
                                 'moderate'              => false,
                                 'throttle'              => false,
+                                'blocked'               => false,
                                 'view_trash'            => false,
 
@@ -451 +457 @@
                                 'moderate'              => false,
                                 'throttle'              => false,
+                                'blocked'               => true,
                                 'view_trash'            => false,
 
@@ -498 +505 @@
                                 'moderate'              => false,
                                 'throttle'              => false,
+                                'blocked'               => false,
                                 'view_trash'            => false,