Changeset 3162

Timestamp:

05/15/2011 08:53:28 AM (14 years ago)

Author:

johnjamesjacoby

Message:

Improve support of suppressing private forum meta data. Fixes #1522. Props GautamGupta.

Location:

branches/plugin/bbp-includes

Files:

• bbp-core-hooks.php (modified) (1 diff)
• bbp-forum-template.php (modified) (1 diff)

branches/plugin/bbp-includes/bbp-core-hooks.php

@@ -295 +295 @@
 add_filter( 'wp_insert_post_data', 'bbp_fix_post_author', 30, 2 );
 
+// Suppress private forum details
+add_filter( 'bbp_get_forum_topic_count',    'bbp_suppress_private_forum_meta',  10, 2 );
+add_filter( 'bbp_get_forum_reply_count',    'bbp_suppress_private_forum_meta',  10, 2 );
+add_filter( 'bbp_get_forum_post_count',     'bbp_suppress_private_forum_meta',  10, 2 );
+add_filter( 'bbp_get_forum_freshness_link', 'bbp_suppress_private_forum_meta',  10, 2 );
+add_filter( 'bbp_get_author_link',          'bbp_suppress_private_author_link', 10, 2 );
+add_filter( 'bbp_get_topic_author_link',    'bbp_suppress_private_author_link', 10, 2 );
+add_filter( 'bbp_get_reply_author_link',    'bbp_suppress_private_author_link', 10, 2 );
+
 /**
  * Add filters to anonymous post author data

branches/plugin/bbp-includes/bbp-forum-template.php

@@ -1430 +1430 @@
 }
 
+/**
+ * Replace forum meta details for users that cannot view them.
+ *
+ * @since bbPress (r3162)
+ *
+ * @param string $retval
+ * @param int $forum_id
+ *
+ * @uses bbp_is_forum_private()
+ * @uses current_user_can()
+ *
+ * @return string
+ */
 function bbp_suppress_private_forum_meta( $retval, $forum_id ) {
     if ( bbp_is_forum_private( $forum_id, false ) && !current_user_can( 'read_private_forums' ) )
         return '-';
 
-    return $retval;
-}
-add_filter( 'bbp_get_forum_topic_count',    'bbp_suppress_private_forum_meta', 10, 2 );
-add_filter( 'bbp_get_forum_reply_count',    'bbp_suppress_private_forum_meta', 10, 2 );
-add_filter( 'bbp_get_forum_post_count',     'bbp_suppress_private_forum_meta', 10, 2 );
-add_filter( 'bbp_get_forum_freshness_link', 'bbp_suppress_private_forum_meta', 10, 2 );
-
+    return apply_filters( 'bbp_suppress_private_forum_meta', $retval );
+}
+
+/**
+ * Replace forum author details for users that cannot view them.
+ *
+ * @since bbPress (r3162)
+ *
+ * @param string $retval
+ * @param int $forum_id
+ *
+ * @uses bbp_is_forum_private()
+ * @uses get_post_field()
+ * @uses bbp_get_topic_post_type()
+ * @uses bbp_is_forum_private()
+ * @uses bbp_get_topic_forum_id()
+ * @uses bbp_get_reply_post_type()
+ * @uses bbp_get_reply_forum_id()
+ *
+ * @return string
+ */
 function bbp_suppress_private_author_link( $author_link, $args ) {
-    if ( empty( $args['post_id'] ) || current_user_can( 'read_private_forums' ) )
-        return $author_link;
-
-    $post_type = get_post_field( 'post_type', $args['post_id'] );
-
-    switch ( $post_type ) {
-        case bbp_get_topic_post_type() :
-            if ( bbp_is_forum_private( bbp_get_topic_forum_id( $args['post_id'] ) ) )
-                return '';
-
-            break;
-
-        case bbp_get_reply_post_type() :
-            if ( bbp_is_forum_private( bbp_get_reply_forum_id( $args['post_id'] ) ) )
-                return '';
-
-            break;
-
-        default :
-            if ( bbp_is_forum_private( $args['post_id'] ) )
-                return '';
-
-            break;
-    }
-
-    return $author_link;
-}
-add_filter( 'bbp_get_author_link',       'bbp_suppress_private_author_link', 10, 2 );
-add_filter( 'bbp_get_topic_author_link', 'bbp_suppress_private_author_link', 10, 2 );
-add_filter( 'bbp_get_reply_author_link', 'bbp_suppress_private_author_link', 10, 2 );
+
+    // Assume the author link is the return value
+    $retval = $author_link;
+
+    // Show the normal author link
+    if ( !empty( $args['post_id'] ) && !current_user_can( 'read_private_forums' ) ) {
+
+        // What post type are we
+        $post_type = get_post_field( 'post_type', $args['post_id'] );
+
+        switch ( $post_type ) {
+
+            // Topic
+            case bbp_get_topic_post_type() :
+                if ( bbp_is_forum_private( bbp_get_topic_forum_id( $args['post_id'] ) ) )
+                    $retval = '';
+
+                break;
+
+            // Reply
+            case bbp_get_reply_post_type() :
+                if ( bbp_is_forum_private( bbp_get_reply_forum_id( $args['post_id'] ) ) )
+                    $retval = '';
+
+                break;
+
+            // Post
+            default :
+                if ( bbp_is_forum_private( $args['post_id'] ) )
+                    $retval = '';
+
+                break;
+        }
+    }
+
+    return apply_filters( 'bbp_suppress_private_author_link', $author_link );
+}
 
 /**