Changeset 6384 for trunk/src/includes/topics/template.php

Timestamp:

03/20/2017 10:44:00 AM (6 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/topics/template.php (modified) (7 diffs)

trunk/src/includes/topics/template.php

@@ -173 +173 @@
 
     // What are the default allowed statuses (based on user caps)
-    if ( bbp_get_view_all() ) {
+    if ( bbp_get_view_all( 'edit_others_topics' ) ) {
 
         // Default view=all statuses
@@ -310 +310 @@
 
                 // What are the default allowed statuses (based on user caps)
-                if ( bbp_get_view_all() ) {
+                if ( bbp_get_view_all( 'edit_others_topics' ) ) {
                     $sticky_query['post_status'] = $r['post_status'];
 
@@ -900 +900 @@
         }
 
+        // Maybe add view-all args
+        $add_args = bbp_get_view_all( 'edit_others_replies' )
+            ? array( 'view' => 'all' )
+            : false;
+
         // Add pagination to query object
         $pagination_links = paginate_links( array(
@@ -909 +914 @@
             'mid_size'  => 2,
             'end_size'  => 3,
-            'add_args'  => ( bbp_get_view_all() ) ? array( 'view' => 'all' ) : false
+            'add_args'  => $add_args
         ) );
 
@@ -1163 +1168 @@
 
 /**
+ * Return array of public topic statuses.
+ *
+ * @since 2.6.0 bbPress (r6383)
+ *
+ * @uses bbp_get_public_status_id()
+ * @uses bbp_get_closed_status_id()
+ *
+ * @return array
+ */
+function bbp_get_public_topic_statuses() {
+    $statuses = bbp_get_public_topic_statuses();
+
+    return (array) apply_filters( 'bbp_get_public_topic_statuses', $statuses );
+}
+
+/**
  * Is the topic closed to new replies?
  *
@@ -1197 +1218 @@
 
 /**
- * Is the topic not spam or deleted?
+ * Is the topic publicly viewable?
+ *
+ * @since 2.6.0 bbPress (r6383)
+ *
+ * @param int $topic_id Optional. Topic id
+ * @uses bbp_get_topic_id() To get the topic id
+ * @uses bbp_get_topic_status() To get the topic status
+ * @uses apply_filters() Calls 'bbp_is_topic_public' with the topic id
+ * @return bool True if public, false if not.
+ */
+function bbp_is_topic_public( $topic_id = 0 ) {
+    $topic_id  = bbp_get_topic_id( $topic_id );
+    $status    = bbp_get_topic_status( $topic_id );
+    $public    = bbp_get_public_topic_statuses();
+    $is_public = in_array( $status, $public, true );
+
+    return (bool) apply_filters( 'bbp_is_topic_public', (bool) $is_public, $topic_id );
+}
+
+/**
+ * Does the topic have a published status?
  *
  * @since 2.0.0 bbPress (r3496)
@@ -2241 +2282 @@
 
             // Hidden link
-            $retval .= ! bbp_get_view_all()
+            $retval .= ! bbp_get_view_all( 'edit_others_replies' )
                 ? " <a href='" . esc_url( bbp_add_view_all( $link, true ) ) . "'>" . esc_html( $extra ) . "</a>"
                 : " {$extra}";