Changeset 6055 for trunk/src/includes/common/functions.php

Timestamp:

06/05/2016 02:21:41 AM (9 years ago)

Author:

netweb

Message:

General - Administration: Add pending status topic and reply statistics to bbp_get_statistics()

Following the introduction of "pending" status topics and replies in bbPress 2.6, bbp_get_statistics() now includes these count statistics in the hidden topic and reply statistics.

Fixes #2958.

File:

• trunk/src/includes/common/functions.php (modified) (10 diffs)

trunk/src/includes/common/functions.php

@@ -417 +417 @@
  *
  * @since 2.0.0 bbPress (r2769)
+ * @since 2.6.0 bbPress (r6055) Introduced the `count_pending_topics` and
+ *                               `count_pending_replies` arguments.
  *
  * @param array $args Optional. The function supports these arguments (all
@@ -424 +426 @@
  *  - count_topics: Count topics? If set to false, private, spammed and trashed
  *                   topics are also not counted.
+ *  - count_pending_topics: Count pending topics? (only counted if the current
+ *                           user has edit_others_topics cap)
  *  - count_private_topics: Count private topics? (only counted if the current
  *                           user has read_private_topics cap)
@@ -432 +436 @@
  *  - count_replies: Count replies? If set to false, private, spammed and
  *                   trashed replies are also not counted.
+ *  - count_pending_replies: Count pending replies? (only counted if the current
+ *                           user has edit_others_replies cap)
  *  - count_private_replies: Count private replies? (only counted if the current
  *                           user has read_private_replies cap)
@@ -440 +446 @@
  *  - count_tags: Count tags? If set to false, empty tags are also not counted
  *  - count_empty_tags: Count empty tags?
- * @uses bbp_count_users() To count the number of registered users
+ * @uses bbp_get_total_users() To count the number of registered users
  * @uses bbp_get_forum_post_type() To get the forum post type
  * @uses bbp_get_topic_post_type() To get the topic post type
@@ -458 +464 @@
         'count_forums'          => true,
         'count_topics'          => true,
+        'count_pending_topics'  => true,
         'count_private_topics'  => true,
         'count_spammed_topics'  => true,
         'count_trashed_topics'  => true,
         'count_replies'         => true,
+        'count_pending_replies' => true,
         'count_private_replies' => true,
         'count_spammed_replies' => true,
@@ -490 +498 @@
 
     // Post statuses
+    $pending = bbp_get_pending_status_id();
     $private = bbp_get_private_status_id();
     $spam    = bbp_get_spam_status_id();
@@ -504 +513 @@
         if ( current_user_can( 'read_private_topics' ) || current_user_can( 'edit_others_topics' ) || current_user_can( 'view_trash' ) ) {
 
+            // Pending
+            $topics['pending'] = ( ! empty( $r['count_pending_topics'] ) && current_user_can( 'edit_others_topics' ) ) ? (int) $all_topics->{$pending} : 0;
+
             // Private
             $topics['private'] = ( ! empty( $r['count_private_topics'] ) && current_user_can( 'read_private_topics' ) ) ? (int) $all_topics->{$private} : 0;
@@ -514 +526 @@
 
             // Total hidden (private + spam + trash)
-            $topic_count_hidden = $topics['private'] + $topics['spammed'] + $topics['trashed'];
+            $topic_count_hidden = $topics['pending'] + $topics['private'] + $topics['spammed'] + $topics['trashed'];
 
             // Generate the hidden topic count's title attribute
+            $topic_titles[] = ! empty( $topics['pending'] ) ? sprintf( __( 'Pending: %s', 'bbpress' ), number_format_i18n( $topics['pending'] ) ) : '';
             $topic_titles[] = ! empty( $topics['private'] ) ? sprintf( __( 'Private: %s', 'bbpress' ), number_format_i18n( $topics['private'] ) ) : '';
             $topic_titles[] = ! empty( $topics['spammed'] ) ? sprintf( __( 'Spammed: %s', 'bbpress' ), number_format_i18n( $topics['spammed'] ) ) : '';
@@ -536 +549 @@
         if ( current_user_can( 'read_private_replies' ) || current_user_can( 'edit_others_replies' ) || current_user_can( 'view_trash' ) ) {
 
+            // Pending
+            $replies['pending'] = ( ! empty( $r['count_pending_replies'] ) && current_user_can( 'edit_others_replies' ) ) ? (int) $all_replies->{$pending} : 0;
+
             // Private
             $replies['private'] = ( ! empty( $r['count_private_replies'] ) && current_user_can( 'read_private_replies' ) ) ? (int) $all_replies->{$private} : 0;
@@ -546 +562 @@
 
             // Total hidden (private + spam + trash)
-            $reply_count_hidden = $replies['private'] + $replies['spammed'] + $replies['trashed'];
+            $reply_count_hidden = $replies['pending'] + $replies['private'] + $replies['spammed'] + $replies['trashed'];
 
             // Generate the hidden topic count's title attribute
+            $reply_titles[] = ! empty( $replies['pending'] ) ? sprintf( __( 'Pending: %s', 'bbpress' ), number_format_i18n( $replies['pending'] ) ) : '';
             $reply_titles[] = ! empty( $replies['private'] ) ? sprintf( __( 'Private: %s', 'bbpress' ), number_format_i18n( $replies['private'] ) ) : '';
             $reply_titles[] = ! empty( $replies['spammed'] ) ? sprintf( __( 'Spammed: %s', 'bbpress' ), number_format_i18n( $replies['spammed'] ) ) : '';