<!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][8174] trunk: Enable Spam admin tools on non-MS users.php Dashboard panel</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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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/8174">8174</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2014-03-27 18:02:00 +0000 (Thu, 27 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Enable Spam admin tools on non-MS users.php Dashboard panel
This change brings non-MS installations of BuddyPress closer to the
functionality that is native to WP Multisite, with respect to the ability to
manage spam/ham users from the Users panel. It also addresses a shortcoming
whereby admins on non-MS sites would have no way at all to spam/unspam users
if the Settings component was disabled, since the front-end Spam tools are in
that optional component.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/5113">#5113</a>
Props imath, r-a-y</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcoreadminbpcorefunctionsphp">trunk/bp-core/admin/bp-core-functions.php</a></li>
<li><a href="#trunkbpcorebpcoreadminphp">trunk/bp-core/bp-core-admin.php</a></li>
<li><a href="#trunkbpmembersbpmembersfunctionsphp">trunk/bp-members/bp-members-functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcoreadminbpcorefunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/admin/bp-core-functions.php (8173 => 8174)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/admin/bp-core-functions.php 2014-03-27 17:37:41 UTC (rev 8173)
+++ trunk/bp-core/admin/bp-core-functions.php 2014-03-27 18:02:00 UTC (rev 8174)
</span><span class="lines">@@ -825,3 +825,100 @@
</span><span class="cx">
</span><span class="cx"> bp_core_install_signups();
</span><span class="cx"> }
</span><ins>+
+/**
+ * Add "Mark as Spam/Ham" button to user row actions.
+ *
+ * @since BuddyPress (2.0.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&user=$user_object->ID", 'bp-spam-user' ) . "'>" . __( 'Not Spam' ) . "</a>";
+ } else {
+ $actions['spam'] = "<a class='submitdelete' href='" . wp_nonce_url( $url . "?action=spam&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 (2.0.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;
+ $mode = isset( $_POST['mode'] ) ? $_POST['mode'] : false;
+
+ // if this is a multisite, bulk request, stop now!
+ if ( 'list' == $mode ) {
+ return;
+ }
+
+ // 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 (2.0.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
+}
</ins></span></pre></div>
<a id="trunkbpcorebpcoreadminphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-admin.php (8173 => 8174)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-admin.php 2014-03-27 17:37:41 UTC (rev 8173)
+++ trunk/bp-core/bp-core-admin.php 2014-03-27 18:02:00 UTC (rev 8174)
</span><span class="lines">@@ -161,11 +161,18 @@
</span><span class="cx"> add_action( 'tool_box', 'bp_core_admin_available_tools_intro' );
</span><span class="cx"> add_action( 'bp_network_tool_box', 'bp_core_admin_available_tools_intro' );
</span><span class="cx">
</span><ins>+ // On non-multisite, catch
+ add_action( 'load-users.php', 'bp_core_admin_user_manage_spammers' );
+
</ins><span class="cx"> /** Filters ***********************************************************/
</span><span class="cx">
</span><span class="cx"> // Add link to settings page
</span><span class="cx"> add_filter( 'plugin_action_links', array( $this, 'modify_plugin_action_links' ), 10, 2 );
</span><span class="cx"> add_filter( 'network_admin_plugin_action_links', array( $this, 'modify_plugin_action_links' ), 10, 2 );
</span><ins>+
+ // 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 );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkbpmembersbpmembersfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-members/bp-members-functions.php (8173 => 8174)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-members/bp-members-functions.php 2014-03-27 17:37:41 UTC (rev 8173)
+++ trunk/bp-members/bp-members-functions.php 2014-03-27 18:02:00 UTC (rev 8174)
</span><span class="lines">@@ -601,8 +601,13 @@
</span><span class="cx"> *
</span><span class="cx"> * @param int $user_id The ID of the user being spammed/hammed.
</span><span class="cx"> * @param string $status 'spam' if being marked as spam, 'ham' otherwise.
</span><ins>+ * @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.
</ins><span class="cx"> */
</span><del>-function bp_core_process_spammer_status( $user_id, $status ) {
</del><ins>+function bp_core_process_spammer_status( $user_id, $status, $do_wp_cleanup = true ) {
</ins><span class="cx"> global $wpdb;
</span><span class="cx">
</span><span class="cx"> // Bail if no user ID
</span><span class="lines">@@ -631,7 +636,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // When marking as spam in the Dashboard, these actions are handled by WordPress
</span><del>- if ( ! $is_admin ) {
</del><ins>+ if ( $do_wp_cleanup ) {
</ins><span class="cx">
</span><span class="cx"> // Get the blogs for the user
</span><span class="cx"> $blogs = get_blogs_of_user( $user_id, true );
</span><span class="lines">@@ -689,7 +694,7 @@
</span><span class="cx"> * @param int $user_id The user id passed from the make_spam_user hook
</span><span class="cx"> */
</span><span class="cx"> function bp_core_mark_user_spam_admin( $user_id ) {
</span><del>- bp_core_process_spammer_status( $user_id, 'spam' );
</del><ins>+ bp_core_process_spammer_status( $user_id, 'spam', false );
</ins><span class="cx"> }
</span><span class="cx"> add_action( 'make_spam_user', 'bp_core_mark_user_spam_admin' );
</span><span class="cx">
</span><span class="lines">@@ -701,7 +706,7 @@
</span><span class="cx"> * @param int $user_id The user id passed from the make_ham_user hook
</span><span class="cx"> */
</span><span class="cx"> function bp_core_mark_user_ham_admin( $user_id ) {
</span><del>- bp_core_process_spammer_status( $user_id, 'ham' );
</del><ins>+ bp_core_process_spammer_status( $user_id, 'ham', false );
</ins><span class="cx"> }
</span><span class="cx"> add_action( 'make_ham_user', 'bp_core_mark_user_ham_admin' );
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>