<!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][13876] trunk/src: Groups: improve the way BuddyPress handles public group invites</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/13876">13876</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/13876","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>imath</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2024-05-27 19:30:17 +0000 (Mon, 27 May 2024)</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'>Groups: improve the way BuddyPress handles public group invites
- In `bp_group_join_button()`: use specific arguments in case a user has been invited to join a public group to generate the action button.
- In BP Legacy, update the `bp_legacy_theme_ajax_joinleave_group()` ajax callback to move the group request capability check at the right place & remove a wrong extra check about the invite approvement case.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/9054">#9054</a>
Closes https://github.com/buddypress/buddypress/pull/292</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpgroupsbpgroupstemplatephp">trunk/src/bp-groups/bp-groups-template.php</a></li>
<li><a href="#trunksrcbptemplatesbplegacybuddypressfunctionsphp">trunk/src/bp-templates/bp-legacy/buddypress-functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpgroupsbpgroupstemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-groups/bp-groups-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-groups/bp-groups-template.php 2024-05-26 05:15:55 UTC (rev 13875)
+++ trunk/src/bp-groups/bp-groups-template.php 2024-05-27 19:30:17 UTC (rev 13876)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3472,6 +3472,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Get the arguments for the Join button group
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 11.0.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 14.0.0 Handles the case when a user has an invite to join a public group.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param BP_Groups_Group $group The group object.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return Array The arguments for the Join button group
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3533,26 +3534,50 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $button_args;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> case 'public':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $url = wp_nonce_url(
- bp_get_group_url(
- $group,
- bp_groups_get_path_chunks( array( 'join' ) )
- ),
- 'groups_join_group'
- );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $button_args = array(
- 'id' => 'join_group',
- 'component' => 'groups',
- 'must_be_logged_in' => true,
- 'block_self' => false,
- 'wrapper_class' => 'group-button ' . $group->status,
- 'wrapper_id' => 'groupbutton-' . $group->id,
- 'link_href' => $url,
- 'link_text' => __( 'Join Group', 'buddypress' ),
- 'link_title' => __( 'Join Group', 'buddypress' ),
- 'link_class' => 'group-button join-group',
- );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Member has outstanding invitation -
+ // show an "Accept Invitation" button.
+ if ( $group->is_invited ) {
+ $url = add_query_arg( 'redirect_to', bp_get_group_url( $group ), bp_get_group_accept_invite_link( $group ) );
+
+ $button_args = array(
+ 'id' => 'accept_invite',
+ 'component' => 'groups',
+ 'must_be_logged_in' => true,
+ 'block_self' => false,
+ 'wrapper_class' => 'group-button ' . $group->status,
+ 'wrapper_id' => 'groupbutton-' . $group->id,
+ 'link_href' => $url,
+ 'link_text' => __( 'Accept Invitation', 'buddypress' ),
+ 'link_title' => __( 'Accept Invitation', 'buddypress' ),
+ 'link_class' => 'group-button accept-invite',
+ );
+
+ // Member has no outstanding invitation -
+ // show a "Join Group" button.
+ } else {
+ $url = wp_nonce_url(
+ bp_get_group_url(
+ $group,
+ bp_groups_get_path_chunks( array( 'join' ) )
+ ),
+ 'groups_join_group'
+ );
+
+ $button_args = array(
+ 'id' => 'join_group',
+ 'component' => 'groups',
+ 'must_be_logged_in' => true,
+ 'block_self' => false,
+ 'wrapper_class' => 'group-button ' . $group->status,
+ 'wrapper_id' => 'groupbutton-' . $group->id,
+ 'link_href' => $url,
+ 'link_text' => __( 'Join Group', 'buddypress' ),
+ 'link_title' => __( 'Join Group', 'buddypress' ),
+ 'link_class' => 'group-button join-group',
+ );
+ }
+
</ins><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 'private' :
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3573,8 +3598,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'link_class' => 'group-button accept-invite',
</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">- // Member has requested membership but request is pending -
- // show a "Request Sent" button.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Member has requested membership but request is pending -
+ // show a "Request Sent" button.
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $group->is_pending ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $button_args = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'membership_requested',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3589,8 +3614,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'link_class' => 'group-button pending membership-requested',
</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">- // Member has not requested membership yet -
- // show a "Request Membership" button.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Member has not requested membership yet -
+ // show a "Request Membership" button.
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $url = wp_nonce_url(
</span><span class="cx" style="display: block; padding: 0 10px"> bp_get_group_url(
</span></span></pre></div>
<a id="trunksrcbptemplatesbplegacybuddypressfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-templates/bp-legacy/buddypress-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-legacy/buddypress-functions.php 2024-05-26 05:15:55 UTC (rev 13875)
+++ trunk/src/bp-templates/bp-legacy/buddypress-functions.php 2024-05-27 19:30:17 UTC (rev 13876)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6,7 +6,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @package BuddyPress
</span><span class="cx" style="display: block; padding: 0 10px"> * @subpackage BP_Theme_Compat
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @version 12.0.0
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @version 14.0.0
</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"> // Exit if accessed directly.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1610,7 +1610,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Client doesn't distinguish between different request types, so we infer from user status.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( groups_is_user_member( bp_loggedin_user_id(), $group->id ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $request_type = 'leave_group';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( groups_check_user_has_invite( bp_loggedin_user_id(), $group->id ) && 'joinleave_group' !== $action ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( groups_check_user_has_invite( bp_loggedin_user_id(), $group->id ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $request_type = 'accept_invite';
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'private' === $group->status ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $request_type = 'request_membership';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1641,10 +1641,6 @@
</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 'accept_invite' :
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! bp_current_user_can( 'groups_request_membership', array( 'group_id' => $group->id ) ) ) {
- esc_html_e( 'Error accepting invitation', 'buddypress' );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> check_ajax_referer( 'groups_accept_invite' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! groups_accept_invite( bp_loggedin_user_id(), $group->id ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1664,7 +1660,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> case 'request_membership' :
</span><span class="cx" style="display: block; padding: 0 10px"> check_ajax_referer( 'groups_request_membership' );
</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 ( ! groups_send_membership_request( [ 'user_id' => bp_loggedin_user_id(), 'group_id' => $group->id ] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! bp_current_user_can( 'groups_request_membership', array( 'group_id' => $group->id ) ) || ! groups_send_membership_request( [ 'user_id' => bp_loggedin_user_id(), 'group_id' => $group->id ] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> esc_html_e( 'Error requesting membership', 'buddypress' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<a id="group-' . esc_attr( $group->id ) . '" class="group-button disabled pending membership-requested" rel="membership-requested" href="' . esc_url( bp_get_group_url( $group ) ) . '">' . esc_html__( 'Request Sent', 'buddypress' ) . '</a>';
</span></span></pre>
</div>
</div>
</body>
</html>