<!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][4324] trunk/bp-groups: Fixes group invitations so that they work when JavaScript is disabled.</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>4324</dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2011-05-02 20:55:26 +0000 (Mon, 02 May 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes group invitations so that they work when JavaScript is disabled. Fixes #2245. Moves bp_groups_sent_invited_email hook inside invitation loop so that it's actually sent for each invited member.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpgroupsbpgroupsclassesphp">trunk/bp-groups/bp-groups-classes.php</a></li>
<li><a href="#trunkbpgroupsbpgroupsfunctionsphp">trunk/bp-groups/bp-groups-functions.php</a></li>
<li><a href="#trunkbpgroupsbpgroupsnotificationsphp">trunk/bp-groups/bp-groups-notifications.php</a></li>
<li><a href="#trunkbpgroupsbpgroupsscreensphp">trunk/bp-groups/bp-groups-screens.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 (4323 => 4324)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-classes.php 2011-04-30 22:30:06 UTC (rev 4323)
+++ trunk/bp-groups/bp-groups-classes.php 2011-05-02 20:55:26 UTC (rev 4324)
</span><span class="lines">@@ -888,13 +888,18 @@
</span><span class="cx"> return array( 'groups' => $paged_groups, 'total' => $total_groups );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function check_has_invite( $user_id, $group_id ) {
</del><ins>+ function check_has_invite( $user_id, $group_id, $type = 'sent' ) {
</ins><span class="cx"> global $wpdb, $bp;
</span><span class="cx">
</span><span class="cx"> if ( !$user_id )
</span><span class="cx"> return false;
</span><ins>+
+ $sql = "SELECT id FROM {$bp->groups->table_name_members} WHERE user_id = %d AND group_id = %d AND is_confirmed = 0 AND inviter_id != 0";
+
+ if ( 'sent' == $type )
+ $sql .= " AND invite_sent = 1";
</ins><span class="cx">
</span><del>- return $wpdb->get_var( $wpdb->prepare( "SELECT id FROM {$bp->groups->table_name_members} WHERE user_id = %d AND group_id = %d AND is_confirmed = 0 AND inviter_id != 0 AND invite_sent = 1", $user_id, $group_id ) );
</del><ins>+ return $wpdb->get_var( $wpdb->prepare( $sql, $user_id, $group_id ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function delete_invite( $user_id, $group_id ) {
</span></span></pre></div>
<a id="trunkbpgroupsbpgroupsfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-functions.php (4323 => 4324)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-functions.php 2011-04-30 22:30:06 UTC (rev 4323)
+++ trunk/bp-groups/bp-groups-functions.php 2011-05-02 20:55:26 UTC (rev 4324)
</span><span class="lines">@@ -524,7 +524,7 @@
</span><span class="cx"> if ( !$user_id || !$group_id )
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- if ( !groups_is_user_member( $user_id, $group_id ) && !groups_check_user_has_invite( $user_id, $group_id ) ) {
</del><ins>+ if ( !groups_is_user_member( $user_id, $group_id ) && !groups_check_user_has_invite( $user_id, $group_id, 'all' ) ) {
</ins><span class="cx"> $invite = new BP_Groups_Member;
</span><span class="cx"> $invite->group_id = $group_id;
</span><span class="cx"> $invite->user_id = $user_id;
</span><span class="lines">@@ -627,8 +627,22 @@
</span><span class="cx"> return BP_Groups_Group::get_invites( $user_id, $group_id );
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function groups_check_user_has_invite( $user_id, $group_id ) {
- return BP_Groups_Member::check_has_invite( $user_id, $group_id );
</del><ins>+/**
+ * Check to see whether a user has already been invited to a group
+ *
+ * By default, the function checks for invitations that have been sent. Entering 'all' as the $type
+ * parameter will return unsent invitations as well (useful to make sure AJAX requests are not
+ * duplicated)
+ *
+ * @package BuddyPress Groups
+ *
+ * @param int $user_id Potential group member
+ * @param int $group_id Potential group
+ * @param str $type Optional. Use 'sent' to check for sent invites, 'all' to check for all
+ * @return bool Returns true if an invitation is found
+ */
+function groups_check_user_has_invite( $user_id, $group_id, $type = 'sent' ) {
+ return BP_Groups_Member::check_has_invite( $user_id, $group_id, $type );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function groups_delete_all_group_invites( $group_id ) {
</span></span></pre></div>
<a id="trunkbpgroupsbpgroupsnotificationsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-notifications.php (4323 => 4324)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-notifications.php 2011-04-30 22:30:06 UTC (rev 4323)
+++ trunk/bp-groups/bp-groups-notifications.php 2011-05-02 20:55:26 UTC (rev 4324)
</span><span class="lines">@@ -244,9 +244,9 @@
</span><span class="cx"> $message = apply_filters_ref_array( 'groups_notification_group_invites_message', array( $message, &$group, $inviter_name, $inviter_link, $invites_link, $group_link, $settings_link ) );
</span><span class="cx">
</span><span class="cx"> wp_mail( $to, $subject, $message );
</span><ins>+
+ do_action( 'bp_groups_sent_invited_email', $invited_user_id, $subject, $message, $group );
</ins><span class="cx"> }
</span><del>-
- do_action( 'bp_groups_sent_invited_email', $invited_user_id, $subject, $message, $group );
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function groups_at_message_notification( $content, $poster_user_id, $group_id, $activity_id ) {
</span></span></pre></div>
<a id="trunkbpgroupsbpgroupsscreensphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-screens.php (4323 => 4324)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-screens.php 2011-04-30 22:30:06 UTC (rev 4323)
+++ trunk/bp-groups/bp-groups-screens.php 2011-05-02 20:55:26 UTC (rev 4324)
</span><span class="lines">@@ -381,6 +381,12 @@
</span><span class="cx"> if ( !check_admin_referer( 'groups_send_invites', '_wpnonce_send_invites' ) )
</span><span class="cx"> return false;
</span><span class="cx">
</span><ins>+ if ( !empty( $_POST['friends'] ) ) {
+ foreach( (array)$_POST['friends'] as $friend ) {
+ groups_invite_user( array( 'user_id' => $friend, 'group_id' => $bp->groups->current_group->id ) );
+ }
+ }
+
</ins><span class="cx"> // Send the invites.
</span><span class="cx"> groups_send_invites( $bp->loggedin_user->id, $bp->groups->current_group->id );
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>