<!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][7638] trunk: Prevent BP_User_Query from fetching spam users on alphabetical sort</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/7638">7638</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2013-12-02 20:49:29 +0000 (Mon, 02 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Prevent BP_User_Query from fetching spam users on alphabetical sort
BP_User_Query's 'alphabetical' sort type, in contrast to the other values of
'type', does not look at users' last_activity usermeta value. As a result, it
cannot infer spam/deleted/activated status in the same way as the other 'type'
values. To prevent spammed/deleted/unactivated users from being returned on
alphabetical sorts, we do a subquery that limits results to user_status = 0.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/5114">#5114</a>
Props sbrajesh, imath</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcoreclassesphp">trunk/bp-core/bp-core-classes.php</a></li>
<li><a href="#trunkteststestcasescoreclassbpuserqueryphp">trunk/tests/testcases/core/class-bp-user-query.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcorebpcoreclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-classes.php (7637 => 7638)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-classes.php 2013-12-02 13:35:17 UTC (rev 7637)
+++ trunk/bp-core/bp-core-classes.php 2013-12-02 20:49:29 UTC (rev 7638)
</span><span class="lines">@@ -310,6 +310,11 @@
</span><span class="cx"> $sql['order'] = "ASC";
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // Alphabetical queries ignore last_activity, while BP uses last_activity
+ // to infer spam/deleted/non-activated users. To ensure that these users
+ // are filtered out, we add an appropriate sub-query.
+ $sql['where'][] = "u.{$this->uid_name} IN ( SELECT ID FROM {$wpdb->users} WHERE " . bp_core_get_status_sql( '' ) . " )";
+
</ins><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> // Any other 'type' falls through
</span></span></pre></div>
<a id="trunkteststestcasescoreclassbpuserqueryphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/testcases/core/class-bp-user-query.php (7637 => 7638)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/testcases/core/class-bp-user-query.php 2013-12-02 13:35:17 UTC (rev 7637)
+++ trunk/tests/testcases/core/class-bp-user-query.php 2013-12-02 20:49:29 UTC (rev 7638)
</span><span class="lines">@@ -222,4 +222,80 @@
</span><span class="cx">
</span><span class="cx"> $this->assertEquals( array( $u2 ), $found_user_ids );
</span><span class="cx"> }
</span><ins>+
+ /**
+ * @group type
+ * @group spam
+ */
+ public function test_bp_user_query_type_alphabetical_spam_xprofileon() {
+ if ( is_multisite() ) {
+ return;
+ }
+
+ // Make sure xprofile is on
+ $xprofile_toggle = isset( buddypress()->active_components['xprofile'] );
+ buddypress()->active_components['xprofile'] = 1;
+ add_filter( 'bp_disable_profile_sync', '__return_false' );
+
+ $u1 = $this->create_user();
+ $u2 = $this->create_user();
+
+ global $wpdb;
+ bp_core_process_spammer_status( $u1, 'spam' );
+
+ $q = new BP_User_Query( array( 'type' => 'alphabetical', ) );
+
+ // Restore xprofile setting
+ if ( $xprofile_toggle ) {
+ buddypress()->active_components['xprofile'] = 1;
+ } else {
+ unset( buddypress()->active_components['xprofile'] );
+ }
+ remove_filter( 'bp_disable_profile_sync', '__return_false' );
+
+ $found_user_ids = null;
+
+ if ( ! empty( $q->results ) ) {
+ $found_user_ids = array_values( wp_parse_id_list( wp_list_pluck( $q->results, 'ID' ) ) );
+ }
+
+ // Do a assertNotContains because there are weird issues with user #1 as created by WP
+ $this->assertNotContains( $u1, $found_user_ids );
+ }
+
+ /**
+ * @group type
+ * @group spam
+ */
+ public function test_bp_user_query_type_alphabetical_spam_xprofileoff() {
+ $u1 = $this->create_user();
+ $u2 = $this->create_user();
+
+ // Make sure xprofile and profile sync are off
+ $xprofile_toggle = isset( buddypress()->active_components['xprofile'] );
+ buddypress()->active_components['xprofile'] = 0;
+ add_filter( 'bp_disable_profile_sync', '__return_false' );
+
+ bp_core_process_spammer_status( $u1, 'spam' );
+
+ $q = new BP_User_Query( array( 'type' => 'alphabetical', ) );
+
+ // Restore xprofile setting
+ if ( $xprofile_toggle ) {
+ buddypress()->active_components['xprofile'] = 1;
+ } else {
+ unset( buddypress()->active_components['xprofile'] );
+ }
+ remove_filter( 'bp_disable_profile_sync', '__return_false' );
+
+ $found_user_ids = null;
+
+ if ( ! empty( $q->results ) ) {
+ $found_user_ids = array_values( wp_parse_id_list( wp_list_pluck( $q->results, 'ID' ) ) );
+ }
+
+ // Do a assertNotContains because there are weird issues with user #1 as created by WP
+ $this->assertNotContains( $u1, $found_user_ids );
+ }
+
</ins><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>