<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[BuddyPress][12945] trunk/src/bp-members: Member Invites: Centralize access logic.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://buddypress.trac.wordpress.org/changeset/12945">12945</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/12945","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dcavins</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2021-05-10 15:07:41 +0000 (Mon, 10 May 2021)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Member Invites: Centralize access logic.
{U+2022} User must be logged in to pass `bp_members_send_invitation` cap.
{U+2022} Add new capabilities `bp_members_invitations_view_screens`
and `bp_members_invitations_view_send_screen`.
{U+2022} 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 <a href="http://buddypress.trac.wordpress.org/ticket/8139">#8139</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpmembersbpmembersadminbarphp">trunk/src/bp-members/bp-members-adminbar.php</a></li>
<li><a href="#trunksrcbpmembersbpmembersfiltersphp">trunk/src/bp-members/bp-members-filters.php</a></li>
<li><a href="#trunksrcbpmembersbpmembersinvitationsphp">trunk/src/bp-members/bp-members-invitations.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpmembersbpmembersadminbarphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-members/bp-members-adminbar.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-members/bp-members-adminbar.php 2021-05-09 16:45:15 UTC (rev 12944)
+++ trunk/src/bp-members/bp-members-adminbar.php 2021-05-10 15:07:41 UTC (rev 12945)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -193,7 +193,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 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() ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( bp_current_user_can( 'bp_members_invitations_view_screens' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $bp = buddypress();
</span><span class="cx" style="display: block; padding: 0 10px"> $invitations_link = trailingslashit( bp_loggedin_user_domain() . bp_get_members_invitations_slug() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -209,13 +209,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( bp_current_user_can( 'bp_members_send_invitation' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( bp_current_user_can( 'bp_members_invitations_view_send_screen' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $wp_admin_bar->add_node(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => $bp->my_account_menu_id . '-invitations-send',
</span><span class="cx" style="display: block; padding: 0 10px"> 'parent' => $bp->my_account_menu_id . '-invitations',
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => __( 'Send Invites', 'buddypress' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'href' => $invitations_link,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'href' => $invitations_link . 'send-invites/',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'meta' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'class' => 'ab-sub-secondary'
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span></span></pre></div>
<a id="trunksrcbpmembersbpmembersfiltersphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-members/bp-members-filters.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-members/bp-members-filters.php 2021-05-09 16:45:15 UTC (rev 12944)
+++ trunk/src/bp-members/bp-members-filters.php 2021-05-10 15:07:41 UTC (rev 12945)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -149,7 +149,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> case 'bp_members_send_invitation':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( bp_get_members_invitations_allowed() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_user_logged_in() && bp_get_members_invitations_allowed() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $retval = true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -167,6 +167,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ 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;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $retval;
</span></span></pre></div>
<a id="trunksrcbpmembersbpmembersinvitationsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-members/bp-members-invitations.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-members/bp-members-invitations.php 2021-05-09 16:45:15 UTC (rev 12944)
+++ trunk/src/bp-members/bp-members-invitations.php 2021-05-10 15:07:41 UTC (rev 12945)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,9 +15,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $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() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $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';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* Add 'Invitations' to the main user profile navigation */
</span><span class="cx" style="display: block; padding: 0 10px"> bp_core_new_nav_item(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -26,8 +25,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => bp_get_members_invitations_slug(),
</span><span class="cx" style="display: block; padding: 0 10px"> 'position' => 80,
</span><span class="cx" style="display: block; padding: 0 10px"> 'screen_function' => 'members_screen_send_invites',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '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 )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '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' )
</ins><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -42,7 +41,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'parent_url' => $parent_link,
</span><span class="cx" style="display: block; padding: 0 10px"> 'screen_function' => 'members_screen_send_invites',
</span><span class="cx" style="display: block; padding: 0 10px"> 'position' => 10,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'user_has_access' => $user_has_access && $user_can_send && bp_is_my_profile()
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'user_has_access' => $user_has_access && bp_is_my_profile() && bp_user_can( bp_displayed_user_id(), 'bp_members_invitations_view_send_screen' )
</ins><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -54,7 +53,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'parent_url' => $parent_link,
</span><span class="cx" style="display: block; padding: 0 10px"> 'screen_function' => 'members_screen_list_sent_invites',
</span><span class="cx" style="display: block; padding: 0 10px"> 'position' => 20,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'user_has_access' => $user_has_access && ( $user_can_send || $user_has_invites )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'user_has_access' => $user_has_access && bp_user_can( bp_displayed_user_id(), 'bp_members_invitations_view_screens' )
</ins><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>