Changeset 5262 for trunk/bp-activity/bp-activity-classes.php

Timestamp:

11/01/2011 11:21:59 PM (14 years ago)

Author:

djpaul

Message:

Second pass of Akismet support for the Activity component. See #3660

File:

• trunk/bp-activity/bp-activity-classes.php (modified) (7 diffs)

trunk/bp-activity/bp-activity-classes.php

@@ -99 +99 @@
 
     // Static Functions
-    function get( $max = false, $page = 1, $per_page = 25, $sort = 'DESC', $search_terms = false, $filter = false, $display_comments = false, $show_hidden = false, $exclude = false, $in = false, $hide_spam = true ) {
+    function get( $max = false, $page = 1, $per_page = 25, $sort = 'DESC', $search_terms = false, $filter = false, $display_comments = false, $show_hidden = false, $exclude = false, $in = false, $spam = 'ham_only' ) {
         global $wpdb, $bp;
 
@@ -111 +111 @@
 
         // Spam
-        if ( $hide_spam )
+        if ( 'ham_only' == $spam )
             $where_conditions['spam_sql'] = 'a.is_spam = 0';
+        elseif ( 'spam_only' == $spam )
+            $where_conditions['spam_sql'] = 'a.is_spam = 1';
 
         // Searching
@@ -191 +193 @@
 
         if ( $activities && $display_comments )
-            $activities = BP_Activity_Activity::append_comments( $activities, $hide_spam );
+            $activities = BP_Activity_Activity::append_comments( $activities, $spam );
 
         // If $max is set, only return up to the max results
@@ -362 +364 @@
      * @global wpdb $wpdb WordPress database object
      * @param array $activities
-     * @param bool $hide_spam Optional. Defaults to true (don't retrieve spammed items).
+     * @param bool $spam Optional; 'ham_only' (default), 'spam_only' or 'all'.
      * @return array The updated activities with nested comments
      * @since 1.2
      */
-    function append_comments( $activities, $hide_spam = true ) {
+    function append_comments( $activities, $spam = 'ham_only' ) {
         global $bp, $wpdb;
 
@@ -374 +376 @@
         foreach( (array)$activities as $activity ) {
             if ( 'activity_comment' != $activity->type && $activity->mptt_left && $activity->mptt_right )
-                $activity_comments[$activity->id] = BP_Activity_Activity::get_activity_comments( $activity->id, $activity->mptt_left, $activity->mptt_right, $hide_spam );
+                $activity_comments[$activity->id] = BP_Activity_Activity::get_activity_comments( $activity->id, $activity->mptt_left, $activity->mptt_right, $spam );
         }
 
@@ -393 +395 @@
      * @param int $left Left-most node boundary
      * @param into $right Right-most node boundary
-     * @param bool $hide_spam Optional. Defaults to true (don't retrieve spammed items).
+     * @param bool $spam Optional; 'ham_only' (default), 'spam_only' or 'all'.
      * @return array The updated activities with nested comments
      * @since 1.2
      */
-    function get_activity_comments( $activity_id, $left, $right, $hide_spam = true ) {
+    function get_activity_comments( $activity_id, $left, $right, $spam = 'ham_only' ) {
         global $wpdb, $bp;
 
@@ -413 +415 @@
 
             // Don't retrieve activity comments marked as spam
-            if ( $hide_spam )
+            if ( 'ham_only' == $spam )
                 $spam_sql = 'AND a.is_spam = 0';
+            elseif ( 'spam_only' == $spam )
+                $spam_sql = 'AND a.is_spam = 1';
             else
                 $spam_sql = '';
 
-            $sql = apply_filters( 'bp_activity_comments_user_join_filter', $wpdb->prepare( "SELECT a.*, u.user_email, u.user_nicename, u.user_login, u.display_name{$fullname_select} FROM {$bp->activity->table_name} a, {$wpdb->users} u{$fullname_from} WHERE u.ID = a.user_id {$fullname_where} AND a.type = 'activity_comment' ${spam_sql} AND a.item_id = %d AND a.mptt_left BETWEEN %d AND %d ORDER BY a.date_recorded ASC", $activity_id, $left, $right ), $activity_id, $left, $right, $hide_spam );
+            $sql = apply_filters( 'bp_activity_comments_user_join_filter', $wpdb->prepare( "SELECT a.*, u.user_email, u.user_nicename, u.user_login, u.display_name{$fullname_select} FROM {$bp->activity->table_name} a, {$wpdb->users} u{$fullname_from} WHERE u.ID = a.user_id {$fullname_where} AND a.type = 'activity_comment' ${spam_sql} AND a.item_id = %d AND a.mptt_left BETWEEN %d AND %d ORDER BY a.date_recorded ASC", $activity_id, $left, $right ), $activity_id, $left, $right, $spam_sql );
 
             // Retrieve all descendants of the $root node