<!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][5677] branches/1.5/bp-friends: Exclude existing group members and previously banned friends in group invites list.</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/5677">5677</a></dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2012-02-07 00:40:24 +0000 (Tue, 07 Feb 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Exclude existing group members and previously banned friends in group invites list. See <a href="http://buddypress.trac.wordpress.org/ticket/3969">#3969</a> (1.5 branch)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches15bpfriendsbpfriendsclassesphp">branches/1.5/bp-friends/bp-friends-classes.php</a></li>
<li><a href="#branches15bpfriendsbpfriendsfunctionsphp">branches/1.5/bp-friends/bp-friends-functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches15bpfriendsbpfriendsclassesphp"></a>
<div class="modfile"><h4>Modified: branches/1.5/bp-friends/bp-friends-classes.php (5676 => 5677)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.5/bp-friends/bp-friends-classes.php 2012-02-07 00:19:43 UTC (rev 5676)
+++ branches/1.5/bp-friends/bp-friends-classes.php 2012-02-07 00:40:24 UTC (rev 5677)
</span><span class="lines">@@ -294,19 +294,26 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function get_invitable_friend_count( $user_id, $group_id ) {
</span><del>- global $wpdb, $bp;
</del><span class="cx">
</span><del>- $friend_ids = BP_Friends_Friendship::get_friend_user_ids( $user_id );
</del><ins>+ // Setup some data we'll use below
+ $is_group_admin = BP_Groups_Member::check_is_admin( $user_id, $group_id );
+ $friend_ids = BP_Friends_Friendship::get_friend_user_ids( $user_id );
+ $invitable_count = 0;
</ins><span class="cx">
</span><del>- $invitable_count = 0;
</del><span class="cx"> for ( $i = 0, $count = count( $friend_ids ); $i < $count; ++$i ) {
</span><span class="cx">
</span><del>- if ( BP_Groups_Member::check_is_member( (int)$friend_ids[$i], $group_id ) )
</del><ins>+ // If already a member, they cannot be invited again
+ if ( BP_Groups_Member::check_is_member( (int) $friend_ids[$i], $group_id ) )
</ins><span class="cx"> continue;
</span><span class="cx">
</span><del>- if ( BP_Groups_Member::check_has_invite( (int)$friend_ids[$i], $group_id ) )
</del><ins>+ // If user already has invite, they cannot be added
+ if ( BP_Groups_Member::check_has_invite( (int) $friend_ids[$i], $group_id ) )
</ins><span class="cx"> continue;
</span><span class="cx">
</span><ins>+ // If user is not group admin and friend is banned, they cannot be invited
+ if ( ( false === $is_group_admin ) && BP_Groups_Member::check_is_banned( (int) $friend_ids[$i], $group_id ) )
+ continue;
+
</ins><span class="cx"> $invitable_count++;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branches15bpfriendsbpfriendsfunctionsphp"></a>
<div class="modfile"><h4>Modified: branches/1.5/bp-friends/bp-friends-functions.php (5676 => 5677)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.5/bp-friends/bp-friends-functions.php 2012-02-07 00:19:43 UTC (rev 5676)
+++ branches/1.5/bp-friends/bp-friends-functions.php 2012-02-07 00:40:24 UTC (rev 5677)
</span><span class="lines">@@ -206,25 +206,78 @@
</span><span class="cx"> return BP_Friends_Friendship::get_bulk_last_active( $friend_ids );
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function friends_get_friends_invite_list( $user_id = 0 ) {
- global $bp;
</del><ins>+/**
+ * Get a list of friends that a user can invite into this group.
+ *
+ * Excludes friends that are already in the group, and banned friends if the
+ * user is not a group admin.
+ *
+ * @since 1.0
+ * @param int $user_id User ID whose friends to see can be invited
+ * @param int $group_id Group to check possible invitations against
+ * @return mixed False if no friends, array of users if friends
+ */
+function friends_get_friends_invite_list( $user_id = 0, $group_id = 0 ) {
</ins><span class="cx">
</span><del>- if ( !$user_id )
- $user_id = $bp->loggedin_user->id;
</del><ins>+ // Default to logged in user id
+ if ( empty( $user_id ) )
+ $user_id = bp_loggedin_user_id();
</ins><span class="cx">
</span><del>- if ( bp_has_members( 'user_id=' . $user_id . '&type=alphabetical&per_page=0' ) ) {
- while ( bp_members() ) : bp_the_member();
</del><ins>+ // Only group admins can invited previously banned users
+ $user_is_admin = (bool) groups_is_user_admin( $user_id, $group_id );
+
+ // Assume no friends
+ $friends = array();
+
+ // Default args
+ $args = apply_filters( 'bp_friends_pre_get_invite_list', array(
+ 'user_id' => $user_id,
+ 'type' => 'alphabetical',
+ 'per_page' => 0
+ ) );
+
+ // User has friends
+ if ( bp_has_members( $args ) ) {
+
+ /**
+ * Loop through all friends and try to add them to the invitation list.
+ *
+ * Exclude friends that:
+ * 1. are already members of the group
+ * 2. are banned from this group if the current user is also not a
+ * group admin.
+ */
+ while ( bp_members() ) :
+
+ // Load the member
+ bp_the_member();
+
+ // Get the user ID of the friend
+ $friend_user_id = bp_get_member_user_id();
+
+ // Skip friend if already in the group
+ if ( groups_is_user_member( $friend_user_id, $group_id ) )
+ continue;
+
+ // Skip friend if not group admin and user banned from group
+ if ( ( false === $user_is_admin ) && groups_is_user_banned( $friend_user_id, $group_id ) )
+ continue;
+
+ // Friend is safe, so add it to the array of possible friends
</ins><span class="cx"> $friends[] = array(
</span><del>- 'id' => bp_get_member_user_id(),
</del><ins>+ 'id' => $friend_user_id,
</ins><span class="cx"> 'full_name' => bp_get_member_name()
</span><span class="cx"> );
</span><ins>+
</ins><span class="cx"> endwhile;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( empty($friends) )
- return false;
</del><ins>+ // If no friends, explicitly set to false
+ if ( empty( $friends ) )
+ $friends = false;
</ins><span class="cx">
</span><del>- return $friends;
</del><ins>+ // Allow friends to be filtered
+ return apply_filters( 'bp_friends_get_invite_list', $friends, $user_id, $group_id );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function friends_count_invitable_friends( $user_id, $group_id ) {
</span></span></pre>
</div>
</div>
</body>
</html>