<!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][13874] trunk: Groups: joining a group needs to wait for group status to be defined</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/13874">13874</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/13874","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-26 04:56:49 +0000 (Sun, 26 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: joining a group needs to wait for group status to be defined
When the group create first step is completed, the group's status has not been defined by the group creator yet and defaults to public. As the group status & the invite status are set once the group create second step is completed, we need to wait for this step to be achieved to let users join the group being created otherwise it would be possible for a user to "pre-join" a private/hidden group. Checking if the invite status is set is the only way to make sure this second step has been completed. If it's not the case, no need to go further in `groups_join_group()`.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/9162">#9162</a>
Closes https://github.com/buddypress/buddypress/pull/294</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpgroupsbpgroupsfunctionsphp">trunk/src/bp-groups/bp-groups-functions.php</a></li>
<li><a href="#trunktestsphpunitincludesfactoryphp">trunk/tests/phpunit/includes/factory.php</a></li>
<li><a href="#trunktestsphpunittestcasesgroupscachephp">trunk/tests/phpunit/testcases/groups/cache.php</a></li>
<li><a href="#trunktestsphpunittestcasesgroupsclassbpgroupsmemberphp">trunk/tests/phpunit/testcases/groups/class-bp-groups-member.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpgroupsbpgroupsfunctionsphp"></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-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-groups/bp-groups-functions.php 2024-05-25 04:47:42 UTC (rev 13873)
+++ trunk/src/bp-groups/bp-groups-functions.php 2024-05-26 04:56:49 UTC (rev 13874)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -661,7 +661,15 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $group = bp_get_group( $group );
</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 ( empty( $group->id ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * When the group create first step is completed, the group's status has not been defined by the
+ * group creator yet and defaults to public. As the group status & the invite status are set once
+ * the group create second step is completed, we need to wait for this step to be achieved to let
+ * users join the group being created otherwise it would be possible for a user to "pre-join" a
+ * private/hidden group. Checking if the invite status is set is the only way to make sure this
+ * second step has been completed. If it's not the case, no need to go further.
+ */
+ if ( empty( $group->id ) || ! groups_get_groupmeta( $group->id, 'invite_status' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunitincludesfactoryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/includes/factory.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/factory.php 2024-05-25 04:47:42 UTC (rev 13873)
+++ trunk/tests/phpunit/includes/factory.php 2024-05-26 04:56:49 UTC (rev 13874)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -93,12 +93,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> parent::__construct( $factory );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->default_generation_definitions = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'name' => new WP_UnitTest_Generator_Sequence( 'Group %s' ),
- 'description' => new WP_UnitTest_Generator_Sequence( 'Group description %s' ),
- 'slug' => new WP_UnitTest_Generator_Sequence( 'group-slug-%s' ),
- 'status' => 'public',
- 'enable_forum' => true,
- 'date_created' => bp_core_current_time(),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'name' => new WP_UnitTest_Generator_Sequence( 'Group %s' ),
+ 'description' => new WP_UnitTest_Generator_Sequence( 'Group description %s' ),
+ 'slug' => new WP_UnitTest_Generator_Sequence( 'group-slug-%s' ),
+ 'status' => 'public',
+ 'enable_forum' => true,
+ 'date_created' => bp_core_current_time(),
+ 'invite_status' => 'members',
</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">@@ -130,7 +131,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> groups_update_groupmeta( $group_id, 'total_member_count', 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> $last_activity = isset( $args['last_activity'] ) ? $args['last_activity'] : bp_core_current_time();
</span><span class="cx" style="display: block; padding: 0 10px"> groups_update_groupmeta( $group_id, 'last_activity', $last_activity );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ groups_update_groupmeta( $group_id, 'invite_status', $args['invite_status'] );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> return $group_id;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestcasesgroupscachephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/testcases/groups/cache.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/testcases/groups/cache.php 2024-05-25 04:47:42 UTC (rev 13873)
+++ trunk/tests/phpunit/testcases/groups/cache.php 2024-05-26 04:56:49 UTC (rev 13874)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -41,6 +41,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'last_activity' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> $time,
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'invite_status' => array(
+ 'members',
+ ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'foo' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'bar',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -52,6 +55,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'last_activity' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> $time,
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'invite_status' => array(
+ 'members',
+ ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'foo' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'baz',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span></span></pre></div>
<a id="trunktestsphpunittestcasesgroupsclassbpgroupsmemberphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/testcases/groups/class-bp-groups-member.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/testcases/groups/class-bp-groups-member.php 2024-05-25 04:47:42 UTC (rev 13873)
+++ trunk/tests/phpunit/testcases/groups/class-bp-groups-member.php 2024-05-26 04:56:49 UTC (rev 13874)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -207,7 +207,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Test with no status
</span><span class="cx" style="display: block; padding: 0 10px"> // In bp_group_get_invite_status(), no status falls back to "members"
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( '' == groups_get_groupmeta( $g, 'invite_status' ) );
</del><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( bp_groups_user_can_send_invites( $g, $u_nonmembers ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( bp_groups_user_can_send_invites( $g, $u_members ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( bp_groups_user_can_send_invites( $g, $u_mods ) );
</span></span></pre>
</div>
</div>
</body>
</html>