Ticket #5113: 5113.02.patch

bp-core/admin/bp-core-functions.php

@@ -765 +765 @@
         </script>
         <?php
 }
+
+/**
+ * Add "Mark as Spam/Ham" button to user row actions.
+ *
+ * @since BuddyPress (1.9.0)
+ *
+ * @param array $actions User row action links.
+ * @param object $user_object Current user information.
+ * @return array $actions User row action links.
+ */
+function bp_core_admin_user_row_actions( $actions, $user_object ) {
+
+        if ( current_user_can( 'edit_user', $user_object->ID ) && bp_loggedin_user_id() != $user_object->ID ) {
+
+                $url = bp_get_admin_url( 'users.php' );
+
+                if ( bp_is_user_spammer( $user_object->ID ) ) {
+                        $actions['ham'] = "<a href='" . wp_nonce_url( $url . "?action=ham&amp;user=$user_object->ID", 'bp-spam-user' ) . "'>" . __( 'Not Spam' ) . "</a>";
+                } else {
+                        $actions['spam'] = "<a class='submitdelete' href='" . wp_nonce_url( $url . "?action=spam&amp;user=$user_object->ID", 'bp-spam-user' ) . "'>" . __( 'Mark as Spam' ) . "</a>";
+                }
+        }
+
+        return $actions;
+}
+
+/**
+ * Catch requests to mark individual users as spam/ham from users.php.
+ *
+ * @since BuddyPress (1.9.0)
+ */
+function bp_core_admin_user_manage_spammers() {
+
+        // Print our inline scripts on non-Multisite
+        add_action( 'admin_footer', 'bp_core_admin_user_spammed_js' );
+
+        $action  = isset( $_REQUEST['action'] ) ? $_REQUEST['action'] : false;
+        $updated = isset( $_REQUEST['updated'] ) ? $_REQUEST['updated'] : false;
+        $bp      = buddypress();
+
+        // Process a spam/ham request
+        if ( ! empty( $action ) && in_array( $action, array( 'spam', 'ham' ) ) ) {
+
+                check_admin_referer( 'bp-spam-user' );
+
+                $user_id = ! empty( $_REQUEST['user'] ) ? intval( $_REQUEST['user'] ) : false;
+
+                if ( empty( $user_id ) ) {
+                        return;
+                }
+
+                $redirect = wp_get_referer();
+
+                $status = ( $action == 'spam' ) ? 'spam' : 'ham';
+
+                // Process the user
+                bp_core_process_spammer_status( $user_id, $status );
+
+                $redirect = add_query_arg( array( 'updated' => 'marked-' . $status ), $redirect);
+
+                wp_redirect( $redirect );
+        }
+
+        // Display feedback
+        if ( ! empty( $updated ) && in_array( $updated, array( 'marked-spam', 'marked-ham' ) ) ) {
+
+                if ( 'marked-spam' === $updated ) {
+                        $notice = __( 'User marked as spammer. Spam users are visible only to site admins.', 'buddypress' );
+                } else {
+                        $notice = __( 'User removed from spam.', 'buddypress' );
+                }
+
+                bp_core_add_admin_notice( $notice );
+        }
+}
+
+/**
+ * Inline script that adds the 'site-spammed' class to spammed users.
+ *
+ * @since BuddyPress (1.9.0)
+ */
+function bp_core_admin_user_spammed_js() {
+        ?>
+        <script type="text/javascript">
+                jQuery( document ).ready( function($) {
+                        $( '.row-actions .ham' ).each( function() {
+                                $( this ).closest( 'tr' ).addClass( 'site-spammed' );
+                        });
+                });
+        </script>
+        <?php
+}

bp-core/bp-core-admin.php

@@ -150 +150 @@
                 // Add settings
                 add_action( 'bp_register_admin_settings', array( $this, 'register_admin_settings' ) );
 
+                // On non-multisite, catch
+                add_action( 'load-users.php', 'bp_core_admin_user_manage_spammers' );
+
                 /** Filters ***********************************************************/
 
                 // Add link to settings page
                 add_filter( 'plugin_action_links',               array( $this, 'modify_plugin_action_links' ), 10, 2 );
                 add_filter( 'network_admin_plugin_action_links', array( $this, 'modify_plugin_action_links' ), 10, 2 );
+
+                // Add "Mark as Spam" row actions on users.php
+                add_filter( 'ms_user_row_actions', 'bp_core_admin_user_row_actions', 10, 2 );
+                add_filter( 'user_row_actions',    'bp_core_admin_user_row_actions', 10, 2 );
         }
 
         /**

bp-members/bp-members-functions.php

@@ -540 +540 @@
  *
  * @param int $user_id The ID of the user being spammed/hammed.
  * @param string $status 'spam' if being marked as spam, 'ham' otherwise.
+ * @param bool $do_wp_cleanup True to force the cleanup of WordPress content
+ *        and status, otherwise false. Generally, this should only be false if
+ *        WordPress is expected to have performed this cleanup independently,
+ *        as when hooked to 'make_spam_user'.
+ * @return bool True on success, false on failure.
  */
-function bp_core_process_spammer_status( $user_id, $status ) {
+function bp_core_process_spammer_status( $user_id, $status, $do_wp_cleanup = true ) {
         global $wpdb;
 
         // Bail if no user ID
@@ -558 +563 @@
         }
 
         $is_spam = ( 'spam' == $status );
+        $bp = buddypress();
 
         // Only you can prevent infinite loops
         remove_action( 'make_spam_user', 'bp_core_mark_user_spam_admin' );
         remove_action( 'make_ham_user',  'bp_core_mark_user_ham_admin'  );
 
         // When marking as spam in the Dashboard, these actions are handled by WordPress
-        if ( !is_admin() ) {
+        if ( $do_wp_cleanup  ) {
 
                 // Get the blogs for the user
                 $blogs = get_blogs_of_user( $user_id, true );
@@ -622 +628 @@
  * @param int $user_id The user id passed from the make_spam_user hook
  */
 function bp_core_mark_user_spam_admin( $user_id ) {
-        bp_core_process_spammer_status( $user_id, 'spam' );
+        bp_core_process_spammer_status( $user_id, 'spam', false );
 }
 add_action( 'make_spam_user', 'bp_core_mark_user_spam_admin' );
 
@@ -634 +640 @@
  * @param int $user_id The user id passed from the make_ham_user hook
  */
 function bp_core_mark_user_ham_admin( $user_id ) {
-        bp_core_process_spammer_status( $user_id, 'ham' );
+        bp_core_process_spammer_status( $user_id, 'ham', false );
 }
 add_action( 'make_ham_user', 'bp_core_mark_user_ham_admin' );