Changeset 13876

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

Location:

trunk/src

Files:

• bp-groups/bp-groups-template.php (modified) (4 diffs)
• bp-templates/bp-legacy/buddypress-functions.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(

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

@@ -7 +7 @@
  * @package BuddyPress
  * @subpackage BP_Theme_Compat
- * @version 12.0.0
+ * @version 14.0.0
  */
 
@@ -1611 +1611 @@
         if ( groups_is_user_member( bp_loggedin_user_id(), $group->id ) ) {
                 $request_type = 'leave_group';
-        } elseif ( groups_check_user_has_invite( bp_loggedin_user_id(), $group->id ) && 'joinleave_group' !== $action ) {
+        } elseif ( groups_check_user_has_invite( bp_loggedin_user_id(), $group->id ) ) {
                 $request_type = 'accept_invite';
         } elseif ( 'private' === $group->status ) {
@@ -1642 +1642 @@
 
                 case 'accept_invite' :
-                        if ( ! bp_current_user_can( 'groups_request_membership', array( 'group_id' => $group->id ) ) ) {
-                                esc_html_e( 'Error accepting invitation', 'buddypress' );
-                        }
-
                         check_ajax_referer( 'groups_accept_invite' );
 
@@ -1665 +1661 @@
                         check_ajax_referer( 'groups_request_membership' );
 
-                        if ( ! groups_send_membership_request( [ 'user_id' => bp_loggedin_user_id(), 'group_id' => $group->id ] ) ) {
+                        if ( ! bp_current_user_can( 'groups_request_membership', array( 'group_id' => $group->id ) ) || ! groups_send_membership_request( [ 'user_id' => bp_loggedin_user_id(), 'group_id' => $group->id ] ) ) {
                                 esc_html_e( 'Error requesting membership', 'buddypress' );
                         } else {