<!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>[9342] sites/trunk/buddypress.org/public_html/wp-content/plugins/bbpress-org/tools.php: bbPress: update the tool that forum moderators use to mark Users as spammers.</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 { white-space: pre-line; 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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/9342">9342</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/9342","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>johnjamesjacoby</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2019-12-13 19:43:25 +0000 (Fri, 13 Dec 2019)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>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</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkbuddypressorgpublic_htmlwpcontentpluginsbbpressorgtoolsphp">sites/trunk/buddypress.org/public_html/wp-content/plugins/bbpress-org/tools.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkbuddypressorgpublic_htmlwpcontentpluginsbbpressorgtoolsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/buddypress.org/public_html/wp-content/plugins/bbpress-org/tools.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/buddypress.org/public_html/wp-content/plugins/bbpress-org/tools.php 2019-12-13 05:08:52 UTC (rev 9341)
+++ sites/trunk/buddypress.org/public_html/wp-content/plugins/bbpress-org/tools.php 2019-12-13 19:43:25 UTC (rev 9342)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,23 +10,27 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function bbporg_make_user_spammer() {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Bail if not capable
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! current_user_can( 'moderate' ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! current_user_can( 'moderate' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Bail if not viewing a user
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! bbp_is_single_user() )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! bbp_is_single_user() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Bail if no refresh
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( empty( $_GET['spammer'] ) || ( 'true' != $_GET['spammer'] ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $_GET['spammer'] ) || ( 'true' != $_GET['spammer'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Get the user ID
</span><span class="cx" style="display: block; padding: 0 10px"> $user_id = bbp_get_displayed_user_id();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Bail if empty and protect super admins
- if ( empty( $user_id ) || is_super_admin( $user_id ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Bail if empty, and protect keymasters
+ if ( empty( $user_id ) || bbp_is_user_keymaster( $user_id ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,14 +37,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Make array of post types to mark as spam
</span><span class="cx" style="display: block; padding: 0 10px"> $post_types = array( bbp_get_topic_post_type(), bbp_get_reply_post_type() );
</span><span class="cx" style="display: block; padding: 0 10px"> $post_types = "'" . implode( "', '", $post_types ) . "'";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $status = array( bbp_get_public_status_id(), bbp_get_pending_status_id() );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // 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 ) . "'";
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Loop through blogs and remove their posts
</span><span class="cx" style="display: block; padding: 0 10px"> // Get topics and replies
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $posts = $wpdb->get_col( "SELECT ID FROM {$wpdb->posts} WHERE post_author = {$user_id} AND post_status = '{$status}' AND post_type IN ({$post_types})" );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $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})" );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Loop through posts and spam them
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !empty( $posts ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $posts ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $posts as $post_id ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // The routines for topics ang replies are different, so use the
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -57,17 +64,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // 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' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Delete user options
+ bbp_delete_user_options( $user_id );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Remove their name & descriptive info
+ wp_update_user( array(
+ 'ID' => $user_id,
+ 'description' => '',
+ 'first_name' => '',
+ 'last_name' => '',
+ 'display_name' => '',
+ 'user_url' => ''
+ ) );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Block the user
</span><span class="cx" style="display: block; padding: 0 10px"> bbp_set_user_role( $user_id, bbp_get_blocked_role() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Redirect without _GET
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_safe_redirect( bbp_get_user_profile_url( $user_id ) );
- die;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ bbp_redirect( bbp_get_user_profile_url( $user_id ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'bbp_template_redirect', 'bbporg_make_user_spammer' );
</span></span></pre>
</div>
</div>
</body>
</html>