Changeset 7029 for trunk/src/includes/users/capabilities.php

Timestamp:

12/13/2019 07:30:18 PM (5 years ago)

Author:

johnjamesjacoby

Message:

Users: ensure topic & reply counts and last posted time are updated when user is spammed & hammed.

This commit ensures that these user meta values are correct when a user is marked (or unmarked) as a spammer. In addition, the newer topic status function is used to ensure that Closed topics are included.

See #3305. For 2.7, trunk.

File:

• trunk/src/includes/users/capabilities.php (modified) (6 diffs)

trunk/src/includes/users/capabilities.php

@@ -485 +485 @@
     }
 
-    // Make array of post types to mark as spam
+    // Get array of post types to mark as spam
     $post_types = array( bbp_get_topic_post_type(), bbp_get_reply_post_type() );
     $post_types = "'" . implode( "', '", $post_types ) . "'";
 
+    // Get array of statuses to mark as spam
+    $post_statuses = bbp_get_public_topic_statuses();
+    $post_statuses = "'" . implode( "', '", $post_statuses ) . "'";
+
     // Loop through blogs and remove their posts
     foreach ( (array) array_keys( $blogs ) as $blog_id ) {
@@ -496 +500 @@
 
         // Get topics and replies
-        $query = $bbp_db->prepare( "SELECT ID FROM {$bbp_db->posts} WHERE post_author = %d AND post_status = %s AND post_type IN ( {$post_types} )", $user_id, bbp_get_public_status_id() );
+        $query = $bbp_db->prepare( "SELECT ID FROM {$bbp_db->posts} WHERE post_author = %d AND post_status IN ( {$post_statuses} ) AND post_type IN ( {$post_types} )", $user_id );
         $posts = $bbp_db->get_col( $query );
 
@@ -522 +526 @@
     }
 
+    // Delete user options
+    bbp_delete_user_options( $user_id );
+
     // Success
     return true;
@@ -563 +570 @@
     }
 
-    // Make array of post types to mark as spam
+    // Get array of post types to mark as spam
     $post_types = array( bbp_get_topic_post_type(), bbp_get_reply_post_type() );
     $post_types = "'" . implode( "', '", $post_types ) . "'";
 
+    // Get array of statuses to unmark as spam
+    $post_statuses = array( bbp_get_spam_status_id() );
+    $post_statuses = "'" . implode( "', '", $post_statuses ) . "'";
+
     // Loop through blogs and remove their posts
     foreach ( (array) array_keys( $blogs ) as $blog_id ) {
@@ -574 +585 @@
 
         // Get topics and replies
-        $query = $bbp_db->prepare( "SELECT ID FROM {$bbp_db->posts} WHERE post_author = %d AND post_status = %s AND post_type IN ( {$post_types} )", $user_id, bbp_get_spam_status_id() );
+        $query = $bbp_db->prepare( "SELECT ID FROM {$bbp_db->posts} WHERE post_author = %d AND post_status IN ( {$post_statuses} ) AND post_type IN ( {$post_types} )", $user_id );
         $posts = $bbp_db->get_col( $query );
 
@@ -600 +611 @@
     }
 
+    // Update topic & reply counts
+    bbp_update_user_topic_count( $user_id, bbp_get_user_topic_count_raw( $user_id ) );
+    bbp_update_user_reply_count( $user_id, bbp_get_user_reply_count_raw( $user_id ) );
+
+    // Update last posted (to now)
+    bbp_update_user_last_posted( $user_id );
+
     // Success
     return true;