<!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][7144] trunk/bp-groups/bp-groups-classes.php: Improves the algorithm for filtering by role in BP_Group_Member_Query</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/7144">7144</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2013-06-04 03:04:23 +0000 (Tue, 04 Jun 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Improves the algorithm for filtering by role in BP_Group_Member_Query
Filtering by group role is tricky, because group role data is declared
explicitly in the database only for 'admin', 'mod', and 'banned' - 'member'
status is implicit, when these other three values are 0. The improved algorithm
assembles a role whitelist in cases where the list of roles being filtered does
not include 'member', and a role blacklist in the case where the list does
contain 'member'.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpgroupsbpgroupsclassesphp">trunk/bp-groups/bp-groups-classes.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpgroupsbpgroupsclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-classes.php (7143 => 7144)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-classes.php 2013-06-04 03:04:18 UTC (rev 7143)
+++ trunk/bp-groups/bp-groups-classes.php 2013-06-04 03:04:23 UTC (rev 7144)
</span><span class="lines">@@ -1030,59 +1030,41 @@
</span><span class="cx"> $sql['where'][] = $wpdb->prepare( "group_id = %d", $this->query_vars['group_id'] );
</span><span class="cx">
</span><span class="cx"> // Role information is stored as follows: admins have
</span><del>- // is_admin = 1, mods have is_mod = 1, and members have both
- // set to 0.
</del><ins>+ // is_admin = 1, mods have is_mod = 1, banned have is_banned =
+ // 1, and members have all three set to 0.
</ins><span class="cx"> $roles = !empty( $this->query_vars['group_role'] ) ? $this->query_vars['group_role'] : array();
</span><span class="cx"> if ( is_string( $roles ) ) {
</span><span class="cx"> $roles = explode( ',', $roles );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // Sanitize: Only 'admin', 'mod', and 'member' are valid
</del><ins>+ // Sanitize: Only 'admin', 'mod', 'member', and 'banned' are valid
+ $allowed_roles = array( 'admin', 'mod', 'member', 'banned' );
</ins><span class="cx"> foreach ( $roles as $role_key => $role_value ) {
</span><del>- if ( ! in_array( $role_value, array( 'admin', 'mod', 'member' ) ) ) {
</del><ins>+ if ( ! in_array( $role_value, $allowed_roles ) ) {
</ins><span class="cx"> unset( $roles[ $role_key ] );
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // Remove dupes to make the count accurate, and flip for faster
- // isset() lookups
- $roles = array_flip( array_unique( $roles ) );
</del><ins>+ $roles = array_unique( $roles );
</ins><span class="cx">
</span><del>- switch ( count( $roles ) ) {
</del><ins>+ // When querying for a set of roles containing 'member' (for
+ // which there is no dedicated is_ column), figure out a list
+ // of columns *not* to match
+ if ( in_array( 'member', $roles ) ) {
+ $role_columns = array();
+ foreach ( array_diff( $allowed_roles, $roles ) as $excluded_role ) {
+ $role_columns[] = 'is_' . $excluded_role . ' = 0';
+ }
+ $roles_sql = '(' . implode( ' AND ', $role_columns ) . ')';
</ins><span class="cx">
</span><del>- // All three roles means we don't limit results
- case 3 :
- default :
- $roles_sql = '';
- break;
-
- case 2 :
- // member + mod = no admins
- // member + admin = no mods
- if ( isset( $roles['member'] ) ) {
- $roles_sql = isset( $roles['admin'] ) ? "is_mod = 0" : "is_admin = 0";
-
- // Two non-member roles are 'admin' and 'mod'
- } else {
- $roles_sql = "(is_admin = 1 OR is_mod = 1)";
- }
- break;
-
- case 1 :
- // member only means no admins or mods
- if ( isset( $roles['member'] ) ) {
- $roles_sql = "is_admin = 0 AND is_mod = 0";
-
- // Filter by that role only
- } else {
- $roles_sql = isset( $roles['admin'] ) ? "is_admin = 1" : "is_mod = 1";
- }
- break;
-
- // No roles means no users should be returned
- case 0 :
- $roles_sql = $this->no_results['where'];
- break;
</del><ins>+ // When querying for a set of roles *not* containing 'member',
+ // simply construct a list of is_* = 1 clauses
+ } else {
+ $role_columns = array();
+ foreach ( $roles as $role ) {
+ $role_columns[] = 'is_' . $role . ' = 1';
+ }
+ $roles_sql = '(' . implode( ' OR ', $role_columns ) . ')';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( ! empty( $roles_sql ) ) {
</span></span></pre>
</div>
</div>
</body>
</html>