Ticket #8139: 8139.09.02-capabilities.patch

src/bp-members/bp-members-adminbar.php

@@ -193 +193 @@
                 return;
         }
 
-        if ( is_user_logged_in() && bp_get_members_invitations_allowed() && ( bp_current_user_can( 'bp_members_send_invitation' ) || bp_members_invitations_user_has_sent_invites() ) ) {
+        if ( bp_current_user_can( 'bp_members_invitations_view_screens' ) ) {
                 $bp               = buddypress();
                 $invitations_link = trailingslashit( bp_loggedin_user_domain() . bp_get_members_invitations_slug() );
 
@@ -209 +209 @@
                         )
                 );
 
-                if ( bp_current_user_can( 'bp_members_send_invitation' ) ) {
+                if ( bp_current_user_can( 'bp_members_invitations_view_send_screen' ) ) {
                         $wp_admin_bar->add_node(
                                 array(
                                         'id'     => $bp->my_account_menu_id . '-invitations-send',
                                         'parent' => $bp->my_account_menu_id . '-invitations',
                                         'title'  => __( 'Send Invites', 'buddypress' ),
-                                        'href'   => $invitations_link,
+                                        'href'   => $invitations_link . 'send-invites/',
                                         'meta'   => array(
                                                 'class'  => 'ab-sub-secondary'
                                         )

src/bp-members/bp-members-filters.php

@@ -149 +149 @@
                         break;
 
                 case 'bp_members_send_invitation':
-                        if ( bp_get_members_invitations_allowed() ) {
+                        if ( is_user_logged_in() && bp_get_members_invitations_allowed() ) {
                                 $retval = true;
                         }
                         break;
@@ -167 +167 @@
                                 }
                         }
                         break;
+
+                case 'bp_members_invitations_view_screens':
+                        $retval = bp_get_members_invitations_allowed() && ( bp_user_can( $user_id, 'bp_members_send_invitation' ) || bp_members_invitations_user_has_sent_invites( $user_id ) );
+                        break;
+
+                case 'bp_members_invitations_view_send_screen':
+                        $retval = is_user_logged_in() && bp_get_members_invitations_allowed();
+                        break;
         }
 
         return $retval;

src/bp-members/bp-members-invitations.php

@@ -15 +15 @@
                 return;
         }
 
-        $user_has_access  = bp_user_has_access();
-        $user_can_send    = bp_user_can( bp_displayed_user_id(), 'bp_members_send_invitation' );
-        $user_has_invites = bp_members_invitations_user_has_sent_invites( bp_displayed_user_id() );
+        $user_has_access     = bp_user_has_access();
+        $default_subnav_slug = ( bp_is_my_profile() && bp_user_can( bp_displayed_user_id(), 'bp_members_invitations_view_send_screen' ) ) ? 'send-invites' : 'list-invites';
 
         /* Add 'Invitations' to the main user profile navigation */
         bp_core_new_nav_item(
@@ -26 +25 @@
                         'slug'                    => bp_get_members_invitations_slug(),
                         'position'                => 80,
                         'screen_function'         => 'members_screen_send_invites',
-                        'default_subnav_slug'     => ( $user_can_send && bp_is_my_profile() ) ? 'send-invites' : 'list-invites',
-                        'show_for_displayed_user' => $user_has_access && ( $user_can_send || $user_has_invites )
+                        'default_subnav_slug'     => $default_subnav_slug,
+                        'show_for_displayed_user' => $user_has_access && bp_user_can( bp_displayed_user_id(), 'bp_members_invitations_view_screens' )
                 )
         );
 
@@ -42 +41 @@
                         'parent_url'      => $parent_link,
                         'screen_function' => 'members_screen_send_invites',
                         'position'        => 10,
-                        'user_has_access' => $user_has_access && $user_can_send && bp_is_my_profile()
+                        'user_has_access' => $user_has_access && bp_is_my_profile() && bp_user_can( bp_displayed_user_id(), 'bp_members_invitations_view_send_screen' )
                 )
         );
 
@@ -54 +53 @@
                         'parent_url'      => $parent_link,
                         'screen_function' => 'members_screen_list_sent_invites',
                         'position'        => 20,
-                        'user_has_access' => $user_has_access && ( $user_can_send || $user_has_invites )
+                        'user_has_access' => $user_has_access && bp_user_can( bp_displayed_user_id(), 'bp_members_invitations_view_screens' )
                 )
         );
 }

src/bp-templates/bp-legacy/buddypress/members/single/invitations/send-invites.php

@@ -14 +14 @@
         ?>
 </h2>
 
+<?php if ( bp_user_can( bp_displayed_user_id(), 'bp_members_send_invitation' ) ) : ?>
+
 <form class="standard-form members-invitation-form" id="members-invitation-form" method="post">
         <p class="description"><?php esc_html_e( 'Fill out the form below to invite a new user to join this site. Upon submission of the form, an email will be sent to the invitee containing a link to accept your invitation. You may also add a custom message to the email.', 'buddypress' ); ?></p>
 
@@ -30 +32 @@
                 <input id="submit" type="submit" name="submit" class="submit" value="<?php esc_attr_e( 'Send Invitation', 'buddypress' ) ?>" />
         </p>
 </form>
+
+<?php else : ?>
+
+        <p class="bp-feedback error">
+                <span class="bp-icon" aria-hidden="true"></span>
+                <span class="bp-help-text">
+                        <?php echo apply_filters( 'members_invitations_form_access_restricted', esc_html__( 'Sorry, you are not allowed to send invitations.', 'buddypress' ) ); ?>
+                </span>
+        </p>
+
+<?php endif; ?>

src/bp-templates/bp-nouveau/buddypress/members/single/invitations/send-invites.php

@@ -13 +13 @@
         ?>
 </h2>
 
-<p class="bp-feedback info">
-        <span class="bp-icon" aria-hidden="true"></span>
-        <span class="bp-help-text">
-                <?php esc_html_e( 'Fill out the form below to invite a new user to join this site. Upon submission of the form, an email will be sent to the invitee containing a link to accept your invitation. You may also add a custom message to the email.', 'buddypress' ); ?>
-        </span>
-</p>
-
-<form class="standard-form network-invitation-form" id="network-invitation-form" method="post">
-        <label for="bp_members_invitation_invitee_email">
-                <?php esc_html_e( 'Email', 'buddypress' ); ?>
-                <span class="bp-required-field-label"><?php esc_html_e( '(required)', 'buddypress' ); ?></span>
-        </label>
-        <input id="bp_members_invitation_invitee_email" type="email" name="invitee_email" required="required">
-
-        <label for="bp_members_invitation_message">
-                <?php esc_html_e( 'Add a personalized message to the invitation (optional)', 'buddypress' ); ?>
-        </label>
-        <textarea id="bp_members_invitation_message" name="invite_message"></textarea>
-
-        <input type="hidden" name="action" value="send-invite">
-
-        <?php bp_nouveau_submit_button( 'member-send-invite' ); ?>
-</form>
+<?php if ( bp_user_can( bp_displayed_user_id(), 'bp_members_send_invitation' ) ) : ?>
+
+        <?php bp_nouveau_user_feedback( 'member-invitations-help' ); ?>
+
+        <form class="standard-form network-invitation-form" id="network-invitation-form" method="post">
+                <label for="bp_members_invitation_invitee_email">
+                        <?php esc_html_e( 'Email', 'buddypress' ); ?>
+                        <span class="bp-required-field-label"><?php esc_html_e( '(required)', 'buddypress' ); ?></span>
+                </label>
+                <input id="bp_members_invitation_invitee_email" type="email" name="invitee_email" required="required">
+
+                <label for="bp_members_invitation_message">
+                        <?php esc_html_e( 'Add a personalized message to the invitation (optional)', 'buddypress' ); ?>
+                </label>
+                <textarea id="bp_members_invitation_message" name="invite_message"></textarea>
+
+                <input type="hidden" name="action" value="send-invite">
+
+                <?php bp_nouveau_submit_button( 'member-send-invite' ); ?>
+        </form>
+
+<?php else : ?>
+
+        <?php bp_nouveau_user_feedback( 'member-invitations-not-allowed' ); ?>
+
+<?php endif; ?>

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

@@ -1090 +1090 @@
                                 'type'    => 'info',
                                 'message' => __( 'Currently only your friends can invite you to groups. Uncheck the box to allow any member to send invites.', 'buddypress' ),
                         ),
-                        'member-invites-none'               => array(
+                        'member-invitations-help'           => array(
+                                'type'    => 'info',
+                                'message' => __( 'Fill out the form below to invite a new user to join this site. Upon submission of the form, an email will be sent to the invitee containing a link to accept your invitation. You may also add a custom message to the email.', 'buddypress' ),
+                        ),
+                        'member-invitations-none'           => array(
                                 'type'    => 'info',
                                 'message' => __( 'There are no invitations to display.', 'buddypress' ),
                         ),
+                        'member-invitations-not-allowed'    => array(
+                                'type'    => 'error',
+                                /**
+                                 * Use this filter to edit the restricted feedback message displayed into the Send invitation form.
+                                 *
+                                 * @since 8.0.0
+                                 *
+                                 * @param string $value The restricted feedback message displayed into the Send invitation form.
+                                 */
+                                'message' => apply_filters(
+                                        'members_invitations_form_access_restricted',
+                                        __( 'Sorry, you are not allowed to send invitations.', 'buddypress' )
+                                ),
+                        ),
                 )
         );