<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[BuddyPress][5805] branches/1.5/bp-members: Refactors mark-as-spam/ham process, so that it works properly from Network Admin as well as front-end.</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://buddypress.trac.wordpress.org/changeset/5805">5805</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2012-02-17 21:53:04 +0000 (Fri, 17 Feb 2012)</dd>
</dl>

<h3>Log Message</h3>
<pre>Refactors mark-as-spam/ham process, so that it works properly from Network Admin as well as front-end.
A port of r5803 to the 1.5 branch.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/3787">#3787</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branches15bpmembersbpmembersactionsphp">branches/1.5/bp-members/bp-members-actions.php</a></li>
<li><a href="#branches15bpmembersbpmembersfunctionsphp">branches/1.5/bp-members/bp-members-functions.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches15bpmembersbpmembersactionsphp"></a>
<div class="modfile"><h4>Modified: branches/1.5/bp-members/bp-members-actions.php (5804 => 5805)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.5/bp-members/bp-members-actions.php        2012-02-17 17:36:11 UTC (rev 5804)
+++ branches/1.5/bp-members/bp-members-actions.php        2012-02-17 21:53:04 UTC (rev 5805)
</span><span class="lines">@@ -11,15 +11,6 @@
</span><span class="cx"> if ( !defined( 'ABSPATH' ) ) exit;
</span><span class="cx"> 
</span><span class="cx"> /**
</span><del>- * Listens to the $bp component and action variables to determine if the user is viewing the members
- * directory page. If they are, it will set up the directory and load the members directory template.
- *
- * @package BuddyPress Core
- * @global object $bp Global BuddyPress settings object
- * @uses wp_enqueue_script() Loads a JS script into the header of the page.
- * @uses bp_core_load_template() Loads a specific template file.
- */
-/**
</del><span class="cx">  * When a site admin selects &quot;Mark as Spammer/Not Spammer&quot; from the admin menu
</span><span class="cx">  * this action will fire and mark or unmark the user and their blogs as spam.
</span><span class="cx">  * Must be a site admin for this function to run.
</span><span class="lines">@@ -29,82 +20,31 @@
</span><span class="cx">  * @global object $wpdb Global WordPress Database object
</span><span class="cx">  */
</span><span class="cx"> function bp_core_action_set_spammer_status( $user_id = 0 ) {
</span><del>-        global $wpdb;
</del><span class="cx"> 
</span><del>-        // Only super admins can currently spam users
-        if ( !is_super_admin() || bp_is_my_profile() )
-                return;
-
</del><span class="cx">         // Use displayed user if it's not yourself
</span><del>-        if ( empty( $user_id ) &amp;&amp; bp_is_user() )
</del><ins>+        if ( empty( $user_id ) )
</ins><span class="cx">                 $user_id = bp_displayed_user_id();
</span><span class="cx"> 
</span><del>-        // Bail if no user ID
-        if ( empty( $user_id ) )
-                return;
-
-        // Bail if user ID is super admin
-        if ( is_super_admin( $user_id ) )
-                return;
-
</del><span class="cx">         if ( bp_is_current_component( 'admin' ) &amp;&amp; ( in_array( bp_current_action(), array( 'mark-spammer', 'unmark-spammer' ) ) ) ) {
</span><span class="cx"> 
</span><span class="cx">                 // Check the nonce
</span><span class="cx">                 check_admin_referer( 'mark-unmark-spammer' );
</span><span class="cx"> 
</span><del>-                // Get the functions file
-                if ( is_multisite() ) {
-                        require( ABSPATH . 'wp-admin/includes/ms.php' );
-                }
-
</del><span class="cx">                 // To spam or not to spam
</span><del>-                $is_spam = bp_is_current_action( 'mark-spammer' ) ? 1 : 0;
</del><ins>+                $status = bp_is_current_action( 'mark-spammer' ) ? 'spam' : 'ham';
</ins><span class="cx"> 
</span><del>-                // Get the blogs for the user
-                $blogs = get_blogs_of_user( $user_id, true );
</del><ins>+                // The heavy lifting
+                bp_core_process_spammer_status( $user_id, $status );
</ins><span class="cx"> 
</span><del>-                foreach ( (array) $blogs as $key =&gt; $details ) {
-
-                        // Do not mark the main or current root blog as spam
-                        if ( 1 == $details-&gt;userblog_id || bp_get_root_blog_id() == $details-&gt;userblog_id ) {
-                                continue;
-                        }
-
-                        // Update the blog status
-                        update_blog_status( $details-&gt;userblog_id, 'spam', $is_spam );
-                }
-
-                // Finally, mark this user as a spammer
-                if ( is_multisite() ) {
-                        update_user_status( $user_id, 'spam', $is_spam );
-                }
-
-                // Always set single site status
-                $wpdb-&gt;update( $wpdb-&gt;users, array( 'user_status' =&gt; $is_spam ), array( 'ID' =&gt; $user_id ) );
-
-                // Add feedback message
-                if ( $is_spam ) {
</del><ins>+                // Add feedback message. @todo - Error reporting
+                if ( 'spam' == $status ) {
</ins><span class="cx">                         bp_core_add_message( __( 'User marked as spammer. Spam users are visible only to site admins.', 'buddypress' ) );
</span><span class="cx">                 } else {
</span><span class="cx">                         bp_core_add_message( __( 'User removed as spammer.', 'buddypress' ) );
</span><span class="cx">                 }
</span><span class="cx"> 
</span><del>-                // Hide this user's activity
-                if ( $is_spam &amp;&amp; bp_is_active( 'activity' ) ) {
-                        bp_activity_hide_user_activity( $user_id );
-                }
-
-                // We need a special hook for is_spam so that components can delete data at spam time
-                $bp_action = $is_spam ? 'bp_make_spam_user' : 'bp_make_ham_user';
-                do_action( $bp_action, bp_displayed_user_id() );
-
-                // Call multisite actions in single site mode for good measure
-                if ( !is_multisite() ) {
-                        $wp_action = $is_spam ? 'make_spam_user' : 'make_ham_user';
-                        do_action( $wp_action, bp_displayed_user_id() );
-                }
-
-                // Allow plugins to do neat things
</del><ins>+                // Deprecated. Use bp_core_process_spammer_status.
+                $is_spam = 'spam' == $status;
</ins><span class="cx">                 do_action( 'bp_core_action_set_spammer_status', bp_displayed_user_id(), $is_spam );
</span><span class="cx"> 
</span><span class="cx">                 // Redirect back to where we came from
</span></span></pre></div>
<a id="branches15bpmembersbpmembersfunctionsphp"></a>
<div class="modfile"><h4>Modified: branches/1.5/bp-members/bp-members-functions.php (5804 => 5805)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.5/bp-members/bp-members-functions.php        2012-02-17 17:36:11 UTC (rev 5804)
+++ branches/1.5/bp-members/bp-members-functions.php        2012-02-17 21:53:04 UTC (rev 5805)
</span><span class="lines">@@ -487,6 +487,115 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> /**
</span><ins>+ * Processes a spammed or unspammed user
+ *
+ * This function is called in two ways:
+ *  - in bp_core_action_set_spammer_status() (when spamming from the front-end)
+ *  - by bp_core_mark_user_spam_admin() or bp_core_mark_user_ham_admin() (when spamming from the
+ *    Dashboard)
+ *
+ * @since 1.5.5
+ *
+ * @param int $user_id The user being spammed/hammed
+ * @param string $status 'spam' if being marked as spam, 'ham' otherwise
+ */
+function bp_core_process_spammer_status( $user_id, $status ) {
+        global $wpdb;
+        
+        // Only super admins can currently spam users
+        if ( !is_super_admin() || bp_is_my_profile() )
+                return;
+
+        // Bail if no user ID
+        if ( empty( $user_id ) )
+                return;
+                
+        // Bail if user ID is super admin
+        if ( is_super_admin( $user_id ) )
+                return;
+        
+        // Get the functions file
+        if ( is_multisite() ) {
+                require_once( ABSPATH . 'wp-admin/includes/ms.php' );
+        }
+
+        $is_spam = 'spam' == $status;
+
+        // 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() ) {
+                // Get the blogs for the user
+                $blogs = get_blogs_of_user( $user_id, true );
+                
+                foreach ( (array) $blogs as $key =&gt; $details ) {
+                
+                        // Do not mark the main or current root blog as spam
+                        if ( 1 == $details-&gt;userblog_id || bp_get_root_blog_id() == $details-&gt;userblog_id ) {
+                                continue;
+                        }
+                
+                        // Update the blog status
+                        update_blog_status( $details-&gt;userblog_id, 'spam', $is_spam );
+                }
+                
+                // Finally, mark this user as a spammer
+                if ( is_multisite() ) {
+                        update_user_status( $user_id, 'spam', $is_spam );
+                }
+                
+                // Always set single site status
+                $wpdb-&gt;update( $wpdb-&gt;users, array( 'user_status' =&gt; $is_spam ), array( 'ID' =&gt; $user_id ) );
+                                
+                // Call multisite actions in single site mode for good measure
+                if ( !is_multisite() ) {
+                        $wp_action = $is_spam ? 'make_spam_user' : 'make_ham_user';
+                        do_action( $wp_action, bp_displayed_user_id() );
+                }
+        }
+
+        // Hide this user's activity
+        if ( $is_spam &amp;&amp; bp_is_active( 'activity' ) ) {
+                bp_activity_hide_user_activity( $user_id );
+        }
+
+        // We need a special hook for is_spam so that components can delete data at spam time
+        $bp_action = $is_spam ? 'bp_make_spam_user' : 'bp_make_ham_user';
+        do_action( $bp_action, $user_id );
+
+        // Allow plugins to do neat things
+        do_action( 'bp_core_process_spammer_status', $user_id, $is_spam );
+        
+        return true;
+}
+
+/**
+ * Hook to WP's make_spam_user and run our custom BP spam functions
+ *
+ * @since 1.5.5
+ * 
+ * @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' );
+}
+add_action( 'make_spam_user', 'bp_core_mark_user_spam_admin' );
+
+/**
+ * Hook to WP's make_ham_user and run our custom BP spam functions
+ *
+ * @since 1.5.5
+ * 
+ * @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' );
+}
+add_action( 'make_ham_user', 'bp_core_mark_user_ham_admin' );
+
+/**
</ins><span class="cx">  * Checks if the user has been marked as a spammer.
</span><span class="cx">  *
</span><span class="cx">  * @package BuddyPress Core
</span></span></pre>
</div>
</div>

</body>
</html>