Changeset 12945

Timestamp:

05/10/2021 03:07:41 PM (5 years ago)

Author:

dcavins

Message:

Member Invites: Centralize access logic.

• User must be logged in to pass bp_members_send_invitation cap.
• Add new capabilities bp_members_invitations_view_screens

and bp_members_invitations_view_send_screen.

• Use new capabilities in bp_members_admin_bar_add_invitations_menu()

and bp_members_invitations_setup_nav() so that the logic is
consistent in both places.

See #8139.

Location:

trunk/src/bp-members

Files:

• bp-members-adminbar.php (modified) (3 diffs)
• bp-members-filters.php (modified) (2 diffs)
• bp-members-invitations.php (modified) (4 diffs)

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

@@ -194 +194 @@
         }
 
-        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() );
@@ -210 +210 @@
                 );
 
-                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(
@@ -216 +216 @@
                                         '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'

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

@@ -150 +150 @@
 
                 case 'bp_members_send_invitation':
-                        if ( bp_get_members_invitations_allowed() ) {
+                        if ( is_user_logged_in() && bp_get_members_invitations_allowed() ) {
                                 $retval = true;
                         }
@@ -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;
         }

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

@@ -16 +16 @@
         }
 
-        $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 */
@@ -27 +26 @@
                         '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' )
                 )
         );
@@ -43 +42 @@
                         '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' )
                 )
         );
@@ -55 +54 @@
                         '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' )
                 )
         );