Changeset 9342

Timestamp:

12/13/2019 07:43:25 PM (6 years ago)

Author:

johnjamesjacoby

Message:

bbPress: update the tool that forum moderators use to mark Users as spammers.

This commit brings the bespoke Moderator tool up-to-speed with changes coming in bbPress 2.6.4.

See: ​https://bbpress.trac.wordpress.org/ticket/3305

File:

• sites/trunk/buddypress.org/public_html/wp-content/plugins/bbpress-org/tools.php (modified) (4 diffs)

sites/trunk/buddypress.org/public_html/wp-content/plugins/bbpress-org/tools.php

@@ -11 +11 @@
 
     // Bail if not capable
-    if ( ! current_user_can( 'moderate' ) )
+    if ( ! current_user_can( 'moderate' ) ) {
         return;
+    }
 
     // Bail if not viewing a user
-    if ( ! bbp_is_single_user() )
+    if ( ! bbp_is_single_user() ) {
         return;
+    }
 
     // Bail if no refresh
-    if ( empty( $_GET['spammer'] ) || ( 'true' != $_GET['spammer'] ) )
+    if ( empty( $_GET['spammer'] ) || ( 'true' != $_GET['spammer'] ) ) {
         return;
+    }
 
     // Get the user ID
     $user_id = bbp_get_displayed_user_id();
 
-    // Bail if empty and protect super admins
-    if ( empty( $user_id ) || is_super_admin( $user_id ) )
+    // Bail if empty, and protect keymasters
+    if ( empty( $user_id ) || bbp_is_user_keymaster( $user_id ) ) {
         return;
+    }
 
     global $wpdb;
@@ -34 +38 @@
     $post_types  = array( bbp_get_topic_post_type(), bbp_get_reply_post_type() );
     $post_types  = "'" . implode( "', '", $post_types ) . "'";
-    $status      = array( bbp_get_public_status_id(), bbp_get_pending_status_id() );
+
+    // Make array of post statuses to mark as spam
+    $status      = array( bbp_get_public_status_id(), bbp_get_closed_status_id(), bbp_get_pending_status_id() );
+    $status      = "'" . implode( "', '", $status ) . "'";
 
     // Loop through blogs and remove their posts
     // Get topics and replies
-    $posts = $wpdb->get_col( "SELECT ID FROM {$wpdb->posts} WHERE post_author = {$user_id} AND post_status = '{$status}' AND post_type IN ({$post_types})" );
+    $posts = $wpdb->get_col( "SELECT ID FROM {$wpdb->posts} WHERE post_author = {$user_id} AND post_status IN ( '{$status}' ) AND post_type IN ({$post_types})" );
 
     // Loop through posts and spam them
-    if ( !empty( $posts ) ) {
+    if ( ! empty( $posts ) ) {
         foreach ( $posts as $post_id ) {
 
@@ -58 +65 @@
     }
 
-    // Delete the users description from their profile
-    $user_description = get_user_meta( $user_id, 'description');
-    if ( !empty( $user_description ) ) {
-        delete_user_meta( $user_id, 'description' );
-    }
+    // Delete user options
+    bbp_delete_user_options( $user_id );
+
+    // Remove their name & descriptive info
+    wp_update_user( array(
+        'ID'           => $user_id,
+        'description'  => '',
+        'first_name'   => '',
+        'last_name'    => '',
+        'display_name' => '',
+        'user_url'     => ''
+    ) );
 
     // Block the user
@@ -68 +82 @@
 
     // Redirect without _GET
-    wp_safe_redirect( bbp_get_user_profile_url( $user_id ) );
-    die;
+    bbp_redirect( bbp_get_user_profile_url( $user_id ) );
 }
 add_action( 'bbp_template_redirect', 'bbporg_make_user_spammer' );