Ticket #2519: 2519.7.patch

includes/forums/capabilities.php

@@ -214 +214 @@
 /**
  * Maps forum moderator capabilities
  *
- * @since bbPress (rXXXX)
+ * @since bbPress (r5834)
  *
  * @param array  $caps Capabilities for meta capability.
  * @param string $cap Capability name.

includes/users/template.php

@@ -603 +603 @@
                 // Parse arguments against default values
                 $r = bbp_parse_args( $args, array(
                         'post_id' => $post_id,
-                        'before'  => '<span class="bbp-author-ip">(',
-                        'after'   => ')</span>'
+                        'before'  => '<div class="bbp-reply-ip"><span class="bbp-author-ip">(',
+                        'after'   => ')</span></div>'
                 ), 'get_author_ip' );
 
                 // Get the author IP meta value
@@ -620 +620 @@
                 return apply_filters( 'bbp_get_author_ip', $author_ip, $r );
         }
 
+
+/** User Topic and Reply Display Counts ***************************************/
+
+/**
+ * Output the user topic counts
+ *
+ * @since bbPress (r5863)
+ *
+ * @param mixed $args Optional. If an integer, it is used as user id.
+ * @uses bbp_get_author_display_topic_count() To get the user topic counts
+ */
+function bbp_author_display_topic_count( $args = '' ) {
+        echo bbp_get_author_display_topic_count( $args );
+}
+        /**
+         * Return the user topic counts
+         *
+         * @since bbPress (r5863)
+         *
+         * @param mixed $args Optional. If an integer, it is used as user id.
+         * @uses apply_filters Calls 'bbp_no_author_display_topic_count' to
+         *                      not display users topics started counts
+         * @uses bbp_get_user_id() To get the user id
+         * @uses bbp_get_user_topic_count To get the users topics started count
+         * @uses apply_filters() Calls 'bbp_get_author_display_topic_count' with the
+         *                        topics started count and args
+         * @return string Users topics started count
+         */
+        function bbp_get_author_display_topic_count( $args = '' ) {
+
+                // Turn off author displayed topic counts
+                if ( apply_filters( 'bbp_no_author_display_topic_count', is_front_page() ) ) {
+                        return;
+                }
+
+                // Parse arguments against default values
+                $r = bbp_parse_args( $args, array(
+                        'post_id' => 0,
+                        'before'  => '<div class="bbp-author-topic-count">',
+                        'title'   => __( 'Topics Started: ', 'bbpress' ),
+                        'after'   => '</div>'
+                ), 'get_author_display_topic_count' );
+
+                // Used as user ID
+                if ( is_numeric( $args ) ) {
+                        $user_id = bbp_get_user_id( $args );
+
+                // Use post ID author
+                } else {
+                        $user_id = bbp_get_topic_author_id( $r['post_id'] );
+                }
+
+                // Get the users topic count
+                if ( ! empty( $user_id ) ) {
+                        $topic_count = bbp_get_user_topic_count( $user_id );
+                } else {
+                        $topic_count = __( 'unknown', 'bbpress' );
+                }
+
+                // Concatenate
+                $topic_count = $r['before'] . $r['title'] . $topic_count . $r['after'];
+
+                return apply_filters( 'bbp_get_author_display_topic_count', $topic_count, $r, $args );
+        }
+
+/**
+ * Output the user reply counts
+ *
+ * @since bbPress (r5863)
+ *
+ * @param mixed $args Optional. If an integer, it is used as user id.
+ * @uses bbp_get_author_display_reply_count() To get the user reply counts
+ */
+function bbp_author_display_reply_count( $args = '' ) {
+        echo bbp_get_author_display_reply_count( $args );
+}
+        /**
+         * Return the user reply counts
+         *
+         * @since bbPress (r5863)
+         *
+         * @param mixed $args Optional. If an integer, it is used as user id.
+         * @uses apply_filters Calls 'bbp_no_author_display_reply_count' to
+         *                      not display user replies created counts
+         * @uses bbp_get_user_id() To get the user id
+         * @uses bbp_get_user_reply_count To get the users replies created count
+         * @uses apply_filters() Calls 'bbp_get_author_display_reply_count' with the
+         *                        topics started count and args
+         * @return string Users replies created count
+         */
+        function bbp_get_author_display_reply_count( $args = '' ) {
+
+                // Turn off author author displayed reply counts
+                if ( apply_filters( 'bbp_no_author_display_reply_count', is_front_page() ) ) {
+                        return;
+                }
+
+                // Parse arguments against default values
+                $r = bbp_parse_args( $args, array(
+                        'post_id' => 0,
+                        'before'  => '<div class="bbp-author-reply-count">',
+                        'title'   => __( 'Replies Created: ', 'bbpress' ),
+                        'after'   => '</div>'
+                ), 'get_author_display_reply_count' );
+
+                // Used as user ID
+                if ( is_numeric( $args ) ) {
+                        $user_id = bbp_get_user_id( $args );
+
+                // Use post ID author
+                } else {
+                        $user_id = bbp_get_reply_author_id( $r['post_id'] );
+                }
+
+                // Get the users reply count
+                if ( ! empty( $user_id ) ) {
+                        $reply_count = bbp_get_user_reply_count( $user_id );
+                } else {
+                        $reply_count = __( 'unknown', 'bbpress' );
+                }
+
+                // Concatenate
+                $reply_count = $r['before'] . $r['title'] . $reply_count . $r['after'];
+
+                return apply_filters( 'bbp_get_author_display_reply_count', $reply_count, $r, $args );
+        }
+
 /** Anonymous Fields **********************************************************/
 
 /**
@@ -1446 +1573 @@
                 return apply_filters( 'bbp_get_user_topics_created_url', $url, $user_id );
         }
 
-/** Topics Created ************************************************************/
+/** Replies Created ************************************************************/
 
 /**
  * Output the link to the user's replies

templates/default/bbpress/content-single-topic-lead.php

@@ -55 +55 @@
 
                                         <?php do_action( 'bbp_theme_before_topic_author_admin_details' ); ?>
 
-                                        <div class="bbp-topic-ip"><?php bbp_author_ip( bbp_get_topic_id() ); ?></div>
+                                        <?php bbp_author_ip( bbp_get_topic_id() ); ?>
 
                                         <?php do_action( 'bbp_theme_after_topic_author_admin_details' ); ?>
 
                                 <?php endif; ?>
 
+                                <?php if ( ! bbp_is_topic_anonymous() ) : ?>
+
+                                        <?php do_action( 'bbp_theme_before_topic_author_count_details' ); ?>
+
+                                        <?php bbp_author_display_topic_count( bbp_get_topic_author_id() ); ?>
+
+                                        <?php bbp_author_display_reply_count( bbp_get_topic_author_id() ); ?>
+
+                                        <?php do_action( 'bbp_theme_after_topic_author_count_details' ); ?>
+
+                                <?php endif; ?>
+
                                 <?php do_action( 'bbp_theme_after_topic_author_details' ); ?>
 
                         </div><!-- .bbp-topic-author -->

templates/default/bbpress/loop-single-reply.php

@@ -44 +44 @@
 
                         <?php do_action( 'bbp_theme_before_reply_author_admin_details' ); ?>
 
-                        <div class="bbp-reply-ip"><?php bbp_author_ip( bbp_get_reply_id() ); ?></div>
+                        <?php bbp_author_ip( bbp_get_reply_id() ); ?>
 
                         <?php do_action( 'bbp_theme_after_reply_author_admin_details' ); ?>
 
                 <?php endif; ?>
 
+                <?php if ( ! bbp_is_reply_anonymous() ) : ?>
+
+                        <?php do_action( 'bbp_theme_before_reply_author_count_details' ); ?>
+
+                        <?php bbp_author_display_topic_count( bbp_get_reply_author_id() ); ?>
+
+                        <?php bbp_author_display_reply_count( bbp_get_reply_author_id() ); ?>
+
+                        <?php do_action( 'bbp_theme_after_reply_author_count_details' ); ?>
+
+                <?php endif; ?>
+
                 <?php do_action( 'bbp_theme_after_reply_author_details' ); ?>
 
         </div><!-- .bbp-reply-author -->