Changeset 13876 for trunk/src/bp-groups/bp-groups-template.php

Timestamp:

05/27/2024 07:30:17 PM (2 years ago)

Author:

imath

Message:

Groups: improve the way BuddyPress handles public group invites

• In bp_group_join_button(): use specific arguments in case a user has been invited to join a public group to generate the action button.
• In BP Legacy, update the bp_legacy_theme_ajax_joinleave_group() ajax callback to move the group request capability check at the right place & remove a wrong extra check about the invite approvement case.

Fixes #9054
Closes ​https://github.com/buddypress/buddypress/pull/292

File:

• trunk/src/bp-groups/bp-groups-template.php (modified) (4 diffs)

trunk/src/bp-groups/bp-groups-template.php

@@ -3473 +3473 @@
          *
          * @since 11.0.0
+         * @since 14.0.0 Handles the case when a user has an invite to join a public group.
          *
          * @param BP_Groups_Group $group The group object.
@@ -3534 +3535 @@
 
                                 case 'public':
-                                        $url = wp_nonce_url(
-                                                bp_get_group_url(
-                                                        $group,
-                                                        bp_groups_get_path_chunks( array( 'join' ) )
-                                                ),
-                                                'groups_join_group'
-                                        );
-
-                                        $button_args = array(
-                                                'id'                => 'join_group',
-                                                'component'         => 'groups',
-                                                'must_be_logged_in' => true,
-                                                'block_self'        => false,
-                                                'wrapper_class'     => 'group-button ' . $group->status,
-                                                'wrapper_id'        => 'groupbutton-' . $group->id,
-                                                'link_href'         => $url,
-                                                'link_text'         => __( 'Join Group', 'buddypress' ),
-                                                'link_title'        => __( 'Join Group', 'buddypress' ),
-                                                'link_class'        => 'group-button join-group',
-                                        );
+
+                                        // Member has outstanding invitation -
+                                        // show an "Accept Invitation" button.
+                                        if ( $group->is_invited ) {
+                                                $url = add_query_arg( 'redirect_to', bp_get_group_url( $group ), bp_get_group_accept_invite_link( $group ) );
+
+                                                $button_args = array(
+                                                        'id'                => 'accept_invite',
+                                                        'component'         => 'groups',
+                                                        'must_be_logged_in' => true,
+                                                        'block_self'        => false,
+                                                        'wrapper_class'     => 'group-button ' . $group->status,
+                                                        'wrapper_id'        => 'groupbutton-' . $group->id,
+                                                        'link_href'         => $url,
+                                                        'link_text'         => __( 'Accept Invitation', 'buddypress' ),
+                                                        'link_title'        => __( 'Accept Invitation', 'buddypress' ),
+                                                        'link_class'        => 'group-button accept-invite',
+                                                );
+
+                                                // Member has no outstanding invitation -
+                                                // show a "Join Group" button.
+                                        } else {
+                                                $url = wp_nonce_url(
+                                                        bp_get_group_url(
+                                                                $group,
+                                                                bp_groups_get_path_chunks( array( 'join' ) )
+                                                        ),
+                                                        'groups_join_group'
+                                                );
+
+                                                $button_args = array(
+                                                        'id'                => 'join_group',
+                                                        'component'         => 'groups',
+                                                        'must_be_logged_in' => true,
+                                                        'block_self'        => false,
+                                                        'wrapper_class'     => 'group-button ' . $group->status,
+                                                        'wrapper_id'        => 'groupbutton-' . $group->id,
+                                                        'link_href'         => $url,
+                                                        'link_text'         => __( 'Join Group', 'buddypress' ),
+                                                        'link_title'        => __( 'Join Group', 'buddypress' ),
+                                                        'link_class'        => 'group-button join-group',
+                                                );
+                                        }
+
                                         break;
 
@@ -3574 +3599 @@
                                                 );
 
-                                        // Member has requested membership but request is pending -
-                                        // show a "Request Sent" button.
+                                                // Member has requested membership but request is pending -
+                                                // show a "Request Sent" button.
                                         } elseif ( $group->is_pending ) {
                                                 $button_args = array(
@@ -3590 +3615 @@
                                                 );
 
-                                        // Member has not requested membership yet -
-                                        // show a "Request Membership" button.
+                                                // Member has not requested membership yet -
+                                                // show a "Request Membership" button.
                                         } else {
                                                 $url = wp_nonce_url(