Changeset 6384 for trunk/src/includes/replies/functions.php

Timestamp:

03/20/2017 10:44:00 AM (8 years ago)

Author:

johnjamesjacoby

Message:

Moderation: Allow per-forum moderators to edit topics & replies inside of forums they have moderation control over.

This feature require the following changes:

• Prefer read_forum capability check over read_private_forums or read_hidden_forums, and include a $forum_id parameter to assist map_meta_cap filters
• Prefer edit_others_topics|replies over moderate where appropriate, to ensure capability mappings work as intended
• Introduce bbp_get_public_topic_statuses() to replace several duplicate occurrences of the same array usage (also allow these to be filtered)
• Introduce bbp_is_topic_public() (not to be confused with bbp_is_topic_published()) to provide parity with bbp_is_forum_public() and also utilize bbp_get_public_topic_statuses() from above
• Add local caching to bbp_exclude_forum_ids() as a performance optimization to reduce the depth of current_user_can() calls when private & hidden forums are in use
• Add user_can( 'moderate' ) capability checks to various mappings, to ensure forum moderators can read/edit/delete content inside of the individual forums they are moderators of
• Use bbp_get_user_id() where appropriate, rather than casting as int
• Various surrounding code clean-ups

See #2593.

File:

• trunk/src/includes/replies/functions.php (modified) (7 diffs)

trunk/src/includes/replies/functions.php

@@ -179 +179 @@
 
         // User cannot create replies
-        if ( !current_user_can( 'publish_replies' ) ) {
+        if ( ! current_user_can( 'publish_replies' ) ) {
             bbp_add_error( 'bbp_reply_permission', __( '<strong>ERROR</strong>: You do not have permission to reply.', 'bbpress' ) );
         }
@@ -271 +271 @@
 
             // Forum is closed and user cannot access
-            if ( bbp_is_forum_closed( $forum_id ) && !current_user_can( 'edit_forum', $forum_id ) ) {
+            if ( bbp_is_forum_closed( $forum_id ) && ! current_user_can( 'edit_forum', $forum_id ) ) {
                 bbp_add_error( 'bbp_new_reply_forum_closed', __( '<strong>ERROR</strong>: This forum has been closed to new replies.', 'bbpress' ) );
             }
 
             // Forum is private and user cannot access
-            if ( bbp_is_forum_private( $forum_id ) ) {
-                if ( !current_user_can( 'read_private_forums' ) ) {
-                    bbp_add_error( 'bbp_new_reply_forum_private', __( '<strong>ERROR</strong>: This forum is private and you do not have the capability to read or create new replies in it.', 'bbpress' ) );
-                }
+            if ( bbp_is_forum_private( $forum_id ) && ! current_user_can( 'read_forum', $forum_id ) ) {
+                bbp_add_error( 'bbp_new_reply_forum_private', __( '<strong>ERROR</strong>: This forum is private and you do not have the capability to read or create new replies in it.', 'bbpress' ) );
 
             // Forum is hidden and user cannot access
-            } elseif ( bbp_is_forum_hidden( $forum_id ) ) {
-                if ( !current_user_can( 'read_hidden_forums' ) ) {
-                    bbp_add_error( 'bbp_new_reply_forum_hidden', __( '<strong>ERROR</strong>: This forum is hidden and you do not have the capability to read or create new replies in it.', 'bbpress' ) );
-                }
+            } elseif ( bbp_is_forum_hidden( $forum_id ) && ! current_user_can( 'read_forum', $forum_id ) ) {
+                bbp_add_error( 'bbp_new_reply_forum_hidden', __( '<strong>ERROR</strong>: This forum is hidden and you do not have the capability to read or create new replies in it.', 'bbpress' ) );
             }
         }
@@ -572 +568 @@
 
             // User cannot edit this reply
-            if ( !current_user_can( 'edit_reply', $reply_id ) ) {
+            if ( ! current_user_can( 'edit_reply', $reply_id ) ) {
                 bbp_add_error( 'bbp_edit_reply_permission', __( '<strong>ERROR</strong>: You do not have permission to edit that reply.', 'bbpress' ) );
                 return;
@@ -614 +610 @@
 
             // Forum is closed and user cannot access
-            if ( bbp_is_forum_closed( $forum_id ) && !current_user_can( 'edit_forum', $forum_id ) ) {
+            if ( bbp_is_forum_closed( $forum_id ) && ! current_user_can( 'edit_forum', $forum_id ) ) {
                 bbp_add_error( 'bbp_edit_reply_forum_closed', __( '<strong>ERROR</strong>: This forum has been closed to new replies.', 'bbpress' ) );
             }
 
             // Forum is private and user cannot access
-            if ( bbp_is_forum_private( $forum_id ) ) {
-                if ( !current_user_can( 'read_private_forums' ) ) {
-                    bbp_add_error( 'bbp_edit_reply_forum_private', __( '<strong>ERROR</strong>: This forum is private and you do not have the capability to read or create new replies in it.', 'bbpress' ) );
-                }
+            if ( bbp_is_forum_private( $forum_id ) && ! current_user_can( 'read_forum', $forum_id ) ) {
+                bbp_add_error( 'bbp_edit_reply_forum_private', __( '<strong>ERROR</strong>: This forum is private and you do not have the capability to read or create new replies in it.', 'bbpress' ) );
 
             // Forum is hidden and user cannot access
-            } elseif ( bbp_is_forum_hidden( $forum_id ) ) {
-                if ( !current_user_can( 'read_hidden_forums' ) ) {
-                    bbp_add_error( 'bbp_edit_reply_forum_hidden', __( '<strong>ERROR</strong>: This forum is hidden and you do not have the capability to read or create new replies in it.', 'bbpress' ) );
-                }
+            } elseif ( bbp_is_forum_hidden( $forum_id ) && ! current_user_can( 'read_forum', $forum_id ) ) {
+                bbp_add_error( 'bbp_edit_reply_forum_hidden', __( '<strong>ERROR</strong>: This forum is hidden and you do not have the capability to read or create new replies in it.', 'bbpress' ) );
             }
         }
@@ -889 +881 @@
 
     } else {
-        if ( empty( $is_edit ) && !current_user_can( 'throttle' ) ) {
+        if ( empty( $is_edit ) && ! current_user_can( 'throttle' ) ) {
             bbp_update_user_last_posted( $author_id );
         }
@@ -1362 +1354 @@
 
     // Use cannot edit topic
-    if ( !current_user_can( 'edit_topic', $source_topic->ID ) ) {
+    if ( ! current_user_can( 'edit_topic', $source_topic->ID ) ) {
         bbp_add_error( 'bbp_move_reply_source_permission', __( '<strong>ERROR</strong>: You do not have permission to edit the source topic.', 'bbpress' ) );
     }
@@ -1400 +1392 @@
 
                 // User cannot edit the destination topic
-                if ( !current_user_can( 'edit_topic', $destination_topic->ID ) ) {
+                if ( ! current_user_can( 'edit_topic', $destination_topic->ID ) ) {
                     bbp_add_error( 'bbp_move_reply_destination_permission', __( '<strong>ERROR</strong>: You do not have permission to edit the destination topic.', 'bbpress' ) );
                 }