Ticket #5113: 5113.diff

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

@@ -642 +642 @@
 
         return $action;
 }
+
+/**
+ * Adds an action to user's row to mark him as spam/ham
+ * 
+ * @param  array $actions
+ * @param  object $user_object
+ * @uses current_user_can()
+ * @uses bp_loggedin_user_id()
+ * @uses bp_get_admin_url()
+ * @uses bp_is_user_spammer()
+ * @uses wp_nonce_url()
+ * @return array  $actions
+ */
+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' ) . "'>" . __( 'Unmark as spammer' ) . "</a>";
+                else
+                        $actions['spam'] = "<a class='submitdelete' href='" . wp_nonce_url( $url."?action=spam&amp;user=$user_object->ID", 'bp-spam-user' ) . "'>" . __( 'Mark as spammer' ) . "</a>";
+        }
+
+        return $actions;
+}
+
+/**
+ * Checks for a spam/ham user admin request and mark user as requested
+ * 
+ * @uses check_admin_referer()
+ * @uses wp_get_referer()
+ * @uses bp_core_process_spammer_status()
+ * @uses add_query_arg()
+ * @uses wp_redirect();
+ * @uses bp_core_add_admin_notice()
+ */
+function bp_core_admin_user_manage_spammers() {
+        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();
+
+        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';
+
+                // Treat user..
+                $bp->user_admin_spam = true;
+                bp_core_process_spammer_status( $user_id, $status );
+                
+                $redirect = add_query_arg( array( 'updated' => 'marked-'.$status ), $redirect);
+
+                wp_redirect( $redirect );
+                exit();
+        }
+
+        // admin feedback if needed
+        if( !empty( $updated ) && in_array( $updated, array( 'marked-spam', 'marked-ham' ) ) ) {
+
+                if ( 'marked-spam' == $_REQUEST['updated'] ) {
+                        $notice = __( 'User marked as spammer. Spam users are visible only to site admins.', 'buddypress' );
+                } else {
+                        $notice = __( 'User removed as spammer.', 'buddypress' );
+                }
+
+                $_SERVER['REQUEST_URI'] = remove_query_arg( 'updated' );
+
+                if( !empty( $notice ) ) {
+                        bp_core_add_admin_notice( $notice );
+                }
+        }
+}
+
+function bp_core_admin_user_spammed_js() {
+        ?>
+        <script type="text/javascript">
+                jQuery( document ).ready( function($) {
+                        $( '.row-actions .ham').each( function() {
+                                $(this).parent().parent().parent().addClass( 'site-spammed' );
+                        });
+                });
+        </script>
+        <?php
+}

bp-core/bp-core-admin.php

@@ -132 +132 @@
                 // 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 );
+
+                /** For non multisite blogs : users spamming management **************/
+                if( !is_multisite() ) {
+                        add_filter( 'user_row_actions', 'bp_core_admin_user_row_actions', 10, 2 );
+                        add_action( 'load-users.php',   'bp_core_admin_user_manage_spammers'    );
+                }
         }
 
         /**

bp-members/bp-members-functions.php

@@ -559 +559 @@
         }
 
         $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 ( !is_admin() || !empty( $bp->user_admin_spam ) ) {
 
                 // Get the blogs for the user
                 $blogs = get_blogs_of_user( $user_id, true );