Changeset 4324

Timestamp:

05/02/2011 08:55:26 PM (14 years ago)

Author:

boonebgorges

Message:

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.

Location:

trunk/bp-groups

Files:

• bp-groups-classes.php (modified) (1 diff)
• bp-groups-functions.php (modified) (2 diffs)
• bp-groups-notifications.php (modified) (1 diff)
• bp-groups-screens.php (modified) (1 diff)

trunk/bp-groups/bp-groups-classes.php

@@ -889 +889 @@
     }
 
-    function check_has_invite( $user_id, $group_id ) {
+    function check_has_invite( $user_id, $group_id, $type = 'sent' ) {
         global $wpdb, $bp;
 
         if ( !$user_id )
             return false;
-
-        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 ) );
+        
+        $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";
+
+        return $wpdb->get_var( $wpdb->prepare( $sql, $user_id, $group_id ) );
     }
 

trunk/bp-groups/bp-groups-functions.php

@@ -525 +525 @@
         return false;
 
-    if ( !groups_is_user_member( $user_id, $group_id ) && !groups_check_user_has_invite( $user_id, $group_id ) ) {
+    if ( !groups_is_user_member( $user_id, $group_id ) && !groups_check_user_has_invite( $user_id, $group_id, 'all' ) ) {
         $invite                = new BP_Groups_Member;
         $invite->group_id      = $group_id;
@@ -628 +628 @@
 }
 
-function groups_check_user_has_invite( $user_id, $group_id ) {
-    return BP_Groups_Member::check_has_invite( $user_id, $group_id );
+/**
+ * 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 );
 }
 

trunk/bp-groups/bp-groups-notifications.php

@@ -245 +245 @@
 
         wp_mail( $to, $subject, $message );
-    }
-
-    do_action( 'bp_groups_sent_invited_email', $invited_user_id, $subject, $message, $group );
+                
+        do_action( 'bp_groups_sent_invited_email', $invited_user_id, $subject, $message, $group );
+    }
 }
 

trunk/bp-groups/bp-groups-screens.php

@@ -381 +381 @@
             if ( !check_admin_referer( 'groups_send_invites', '_wpnonce_send_invites' ) )
                 return false;
+
+            if ( !empty( $_POST['friends'] ) ) {
+                foreach( (array)$_POST['friends'] as $friend ) {
+                    groups_invite_user( array( 'user_id' => $friend, 'group_id' => $bp->groups->current_group->id ) );
+                }
+            }
 
             // Send the invites.