Changeset 12945 for trunk/src/bp-members/bp-members-invitations.php

Timestamp:

05/10/2021 03:07:41 PM (4 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.

File:

• trunk/src/bp-members/bp-members-invitations.php (modified) (4 diffs)

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' )
         )
     );