Changeset 7442 for trunk/bp-templates/bp-legacy/buddypress-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-templates/bp-legacy/buddypress-functions.php (modified) (3 diffs)

trunk/bp-templates/bp-legacy/buddypress-functions.php

@@ -907 +907 @@
         return;
 
+    $group_id = (int) $_POST['group_id'];
+    $friend_id = (int) $_POST['friend_id'];
+
     if ( 'invite' == $_POST['friend_action'] ) {
-        if ( ! groups_invite_user( array( 'user_id' => $_POST['friend_id'], 'group_id' => $_POST['group_id'] ) ) )
+        $group = groups_get_group( $group_id );
+
+        // Users who have previously requested membership do not need
+        // another invitation created for them
+        if ( BP_Groups_Member::check_for_membership_request( $friend_id, $group_id ) ) {
+            $user_status = 'is_pending';
+
+        // Create the user invitation
+        } else if ( groups_invite_user( array( 'user_id' => $friend_id, 'group_id' => $group_id ) ) ) {
+            $user_status = 'is_invited';
+
+        // Miscellaneous failure
+        } else {
             return;
-
-        $user = new BP_Core_User( $_POST['friend_id'] );
+        }
+
+        $user = new BP_Core_User( $friend_id );
 
         echo '<li id="uid-' . $user->id . '">';
@@ -920 +936 @@
                 <a class="button remove" href="' . wp_nonce_url( bp_loggedin_user_domain() . bp_get_groups_slug() . '/' . $_POST['group_id'] . '/invites/remove/' . $user->id, 'groups_invite_uninvite_user' ) . '" id="uid-' . esc_attr( $user->id ) . '">' . __( 'Remove Invite', 'buddypress' ) . '</a>
               </div>';
+
+        if ( 'is_pending' == $user_status ) {
+            echo '<p class="description">' . sprintf( __( '%s has previously requested to join this group. Sending an invitation will automatically add the member to the group.', 'buddypress' ), $user->user_link ) . '</p>';
+        }
+
         echo '</li>';
         exit;
 
     } elseif ( 'uninvite' == $_POST['friend_action'] ) {
-        if ( ! groups_uninvite_user( $_POST['friend_id'], $_POST['group_id'] ) )
+        // Users who have previously requested membership should not
+        // have their requests deleted on the "uninvite" action
+        if ( BP_Groups_Member::check_for_membership_request( $friend_id, $group_id ) ) {
             return;
+        }
+
+        // Remove the unsent invitation
+        if ( ! groups_uninvite_user( $friend_id, $group_id ) ) {
+            return;
+        }
 
         exit;
@@ -1056 +1085 @@
 
         } elseif ( 'private' == $group->status ) {
-            check_ajax_referer( 'groups_request_membership' );
-
-            if ( ! groups_send_membership_request( bp_loggedin_user_id(), $group->id ) ) {
-                _e( 'Error requesting membership', 'buddypress' );
+
+            // If the user has already been invited, then this is
+            // an Accept Invitation button
+            if ( groups_check_user_has_invite( bp_loggedin_user_id(), $group->id ) ) {
+                check_ajax_referer( 'groups_accept_invite' );
+
+                if ( ! groups_accept_invite( bp_loggedin_user_id(), $group->id ) ) {
+                    _e( 'Error requesting membership', 'buddypress' );
+                } else {
+                    echo '<a id="group-' . esc_attr( $group->id ) . '" class="leave-group" rel="leave" title="' . __( 'Leave Group', 'buddypress' ) . '" href="' . wp_nonce_url( bp_get_group_permalink( $group ) . 'leave-group', 'groups_leave_group' ) . '">' . __( 'Leave Group', 'buddypress' ) . '</a>';
+                }
+
+            // Otherwise, it's a Request Membership button
             } else {
-                echo '<a id="group-' . esc_attr( $group->id ) . '" class="membership-requested" rel="membership-requested" title="' . __( 'Membership Requested', 'buddypress' ) . '" href="' . bp_get_group_permalink( $group ) . '">' . __( 'Membership Requested', 'buddypress' ) . '</a>';
+                check_ajax_referer( 'groups_request_membership' );
+
+                if ( ! groups_send_membership_request( bp_loggedin_user_id(), $group->id ) ) {
+                    _e( 'Error requesting membership', 'buddypress' );
+                } else {
+                    echo '<a id="group-' . esc_attr( $group->id ) . '" class="membership-requested" rel="membership-requested" title="' . __( 'Membership Requested', 'buddypress' ) . '" href="' . bp_get_group_permalink( $group ) . '">' . __( 'Membership Requested', 'buddypress' ) . '</a>';
+                }
             }
         }