Changeset 7442 for trunk/bp-groups/bp-groups-functions.php

Timestamp:

10/17/2013 07:00:46 PM (12 years ago)

Author:

boonebgorges

Message:

Improve UX flow around overlapping group invites and requests

This changeset introduces a number of improvements to the flow surrounding
invitations and membership requests to private groups:

• When a user has previously requested membership in a group, add a note to that effect when the user is being invited to the group via the Send Invites interface.
• When a user has previously requested membership in a group, automatically accept that invitation and add the user to the group when an invitation is sent by an existing group member.
• When a user has previously been invited to a group, buttons in the group directory and in the group header should read Accept Invitation instead of Request Membership

The end result is a more logical user experience with regard to joining private
groups.

Fixes #5032

Props Mike_Cowobo

File:

• trunk/bp-groups/bp-groups-functions.php (modified) (2 diffs)

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

@@ -655 +655 @@
         return false;
 
-    if ( !groups_is_user_member( $user_id, $group_id ) && !groups_check_user_has_invite( $user_id, $group_id, 'all' ) ) {
+    // if the user has already requested membership, accept the request
+    if ( $membership_id = groups_check_for_membership_request( $user_id, $group_id ) ) {
+        groups_accept_membership_request( $membership_id, $user_id, $group_id );
+
+    // Otherwise, create a new invitation
+    } else 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;
@@ -872 +877 @@
     if ( groups_is_user_member( $requesting_user_id, $group_id ) || groups_is_user_banned( $requesting_user_id, $group_id ) )
         return false;
+
+    // Check if the user is already invited - if so, simply accept invite
+    if ( groups_check_user_has_invite( $requesting_user_id, $group_id ) ) {
+        groups_accept_invite( $requesting_user_id, $group_id );
+        return true;
+    }
 
     $requesting_user                = new BP_Groups_Member;