Ticket #8474: 8474-group-invites.patch

src/bp-templates/bp-nouveau/buddypress/common/js-templates/invites/index.php

@@ -6 +6 @@
  * dealing with invites.
  *
  * @since 3.0.0
- * @version 6.0.0
+ * @version 10.0.0
  */
 ?>
 
@@ -57 +57 @@
                         {{data.name}}
                 </div>
 
-                <# if ( undefined !== data.is_sent ) { #>
+                <# if ( 'invited' === data.scope ) { #>
                         <div class="item-meta">
 
-                                <# if ( undefined !== data.invited_by ) { #>
+                                <# if ( data.invited_by.length > 0 ) { #>
                                         <ul class="group-inviters">
                                                 <li><?php esc_html_e( 'Invited by:', 'buddypress' ); ?></li>
                                                 <# for ( i in data.invited_by ) { #>
@@ -82 +82 @@
         </div>
 
         <div class="action">
-                <# if ( undefined === data.is_sent || ( false === data.is_sent && true === data.can_edit ) ) { #>
+                <# if ( true === data.can_invite ) { #>
                         <button type="button" class="button invite-button group-add-remove-invite-button bp-tooltip bp-icons<# if ( data.selected ) { #> selected<# } #>" data-bp-tooltip="<# if ( data.selected ) { #><?php esc_attr_e( 'Cancel invitation', 'buddypress' ); ?><# } else { #><?php echo esc_attr_x( 'Invite', 'button', 'buddypress' ); ?><# } #>">
                                 <span class="icons" aria-hidden="true"></span>
                                 <span class="bp-screen-reader-text">
@@ -95 +95 @@
                         </button>
                 <# } #>
 
-                <# if ( undefined !== data.can_edit && true === data.can_edit ) { #>
+                <# if ( true === data.can_edit ) { #>
                         <button type="button" class="button invite-button group-remove-invite-button bp-tooltip bp-icons" data-bp-tooltip="<?php echo esc_attr_x( 'Cancel invitation', 'button', 'buddypress' ); ?>">
                                 <span class=" icons" aria-hidden="true"></span>
                                 <span class="bp-screen-reader-text"><?php echo esc_attr_x( 'Cancel invitation', 'button', 'buddypress' ); ?></span>

src/bp-templates/bp-nouveau/includes/groups/ajax.php

@@ -283 +283 @@
                 wp_send_json_error( $response );
         }
 
+        if ( ! bp_is_group_create() && ! bp_groups_user_can_send_invites( bp_get_current_group_id(), bp_loggedin_user_id() ) ) {
+                $invite_status = bp_group_get_invite_status( bp_get_current_group_id() );
+                if ( 'admins' === $invite_status ) {
+                        $message = __( 'Inviting members to join this group is restricted to Group Administrators.', 'buddypress' );
+                } else {
+                        $message = __( 'Inviting members to join this group is restricted to Group Moderators and Administrators.', 'buddypress' );
+                }
+
+                wp_send_json_error(
+                        array(
+                                'feedback' => $message,
+                                'type'     => 'error',
+                        )
+                );
+        }
+
         $request = bp_parse_args(
                 $_POST,
                 array(

src/bp-templates/bp-nouveau/includes/groups/functions.php

@@ -199 +199 @@
  * @since 3.0.0
  */
 function bp_nouveau_prepare_group_potential_invites_for_js( $user ) {
-        $bp = buddypress();
+        $bp    = buddypress();
+        $scope = '';
+        if ( isset( $bp->groups->invites_scope ) ) {
+                $scope = $bp->groups->invites_scope;
+        }
 
         $response = array(
-                'id'           => intval( $user->ID ),
-                'name'         => $user->display_name,
-                'avatar'       => htmlspecialchars_decode( bp_core_fetch_avatar( array(
-                        'item_id' => $user->ID,
-                        'object'  => 'user',
-                        'type'    => 'thumb',
-                        'width'   => 50,
-                        'height'  => 50,
-                        'html'    => false )
-                ) ),
+                'id'      => intval( $user->ID ),
+                'name'    => $user->display_name,
+                'avatar'  => htmlspecialchars_decode(
+                        bp_core_fetch_avatar(
+                                array(
+                                        'item_id' => $user->ID,
+                                        'object'  => 'user',
+                                        'type'    => 'thumb',
+                                        'width'   => 50,
+                                        'height'  => 50,
+                                        'html'    => false
+                                )
+                        )
+                ),
+                'scope'      => $scope,
+                'is_sent'    => false,
+                'invited_by' => array(),
+                'can_invite' => 'invited' !== $scope,
         );
 
         // Do extra queries only if needed
-        if ( ! empty( $bp->groups->invites_scope ) && 'invited' === $bp->groups->invites_scope ) {
-                $response['is_sent']  = (bool) groups_check_user_has_invite( $user->ID, bp_get_current_group_id() );
-
-                $inviter_ids = bp_nouveau_groups_get_inviter_ids( $user->ID, bp_get_current_group_id() );
+        if ( 'invited' === $scope ) {
+                $response['is_sent'] = (bool) groups_check_user_has_invite( $user->ID, bp_get_current_group_id() );
+                $inviter_ids         = bp_nouveau_groups_get_inviter_ids( $user->ID, bp_get_current_group_id() );
 
                 foreach ( $inviter_ids as $inviter_id ) {
                         $class = false;
@@ -228 +239 @@
                         }
 
                         $response['invited_by'][] = array(
-                                'avatar' => htmlspecialchars_decode( bp_core_fetch_avatar( array(
-                                        'item_id' => $inviter_id,
-                                        'object'  => 'user',
-                                        'type'    => 'thumb',
-                                        'width'   => 50,
-                                        'height'  => 50,
-                                        'html'    => false,
-                                        'class'   => $class,
-                                ) ) ),
+                                'avatar' => htmlspecialchars_decode(
+                                        bp_core_fetch_avatar(
+                                                array(
+                                                        'item_id' => $inviter_id,
+                                                        'object'  => 'user',
+                                                        'type'    => 'thumb',
+                                                        'width'   => 50,
+                                                        'height'  => 50,
+                                                        'html'    => false,
+                                                        'class'   => $class,
+                                                )
+                                        )
+                                ),
                                 'user_link' => bp_core_get_userlink( $inviter_id, false, true ),
                                 'user_name' => bp_core_get_username( $inviter_id ),
                         );
                 }
 
-                if ( bp_is_item_admin() ) {
-                        $response['can_edit'] = true;
-                } else {
-                        $response['can_edit'] = in_array( bp_loggedin_user_id(), $inviter_ids, true );
-                }
+                $response['can_edit'] = bp_is_item_admin() || in_array( bp_loggedin_user_id(), $inviter_ids, true );
         }
 
         /**