<!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][13448] trunk: Do 404 when trying to reach a page about an unregistered group type</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/13448">13448</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/13448","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>2023-04-07 07:47:34 +0000 (Fri, 07 Apr 2023)</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'>Do 404 when trying to reach a page about an unregistered group type
Improves the way we handle this case making sure we **really** end up to a
404 if the corresponding group type is not registered or do not support
directory filtering. Update corresponding PHP unit tests to really test
this case instead of a case about a member type.
Closes https://github.com/buddypress/buddypress/pull/82
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/8866">#8866</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpcorebpcoretemplatephp">trunk/src/bp-core/bp-core-template.php</a></li>
<li><a href="#trunksrcbpgroupsclassesclassbpgroupscomponentphp">trunk/src/bp-groups/classes/class-bp-groups-component.php</a></li>
<li><a href="#trunksrcbpgroupsclassesclassbpgroupsthemecompatphp">trunk/src/bp-groups/classes/class-bp-groups-theme-compat.php</a></li>
<li><a href="#trunktestsphpunittestcasesroutinggroupsphp">trunk/tests/phpunit/testcases/routing/groups.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpcorebpcoretemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-core/bp-core-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/bp-core-template.php 2023-04-04 01:58:33 UTC (rev 13447)
+++ trunk/src/bp-core/bp-core-template.php 2023-04-07 07:47:34 UTC (rev 13448)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2779,11 +2779,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool True if the current page is the groups directory.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function bp_is_groups_directory() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( bp_is_groups_component() && ! bp_is_group() && ( ! bp_current_action() || ( bp_action_variable() && bp_is_current_action( bp_get_groups_group_type_base() ) ) ) ) {
- return true;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $return = false;
+
+ if ( bp_is_groups_component() && ! bp_is_group() ) {
+ $return = ! bp_current_action() || ! empty( buddypress()->groups->current_directory_type );
</ins><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">- return false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $return;
</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>
<a id="trunksrcbpgroupsclassesclassbpgroupscomponentphp"></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/classes/class-bp-groups-component.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-groups/classes/class-bp-groups-component.php 2023-04-04 01:58:33 UTC (rev 13447)
+++ trunk/src/bp-groups/classes/class-bp-groups-component.php 2023-04-07 07:47:34 UTC (rev 13448)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -321,28 +321,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->current_group = 0;
</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">- // Set group type if available.
- if ( bp_is_groups_directory() && bp_is_current_action( bp_get_groups_group_type_base() ) && bp_action_variable() ) {
- $matched_types = bp_groups_get_group_types( array(
- 'has_directory' => true,
- 'directory_slug' => bp_action_variable(),
- ) );
-
- // Set 404 if we do not have a valid group type.
- if ( empty( $matched_types ) ) {
- bp_do_404();
- return;
- }
-
- // Set our directory type marker.
- $this->current_directory_type = reset( $matched_types );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> // Set up variables specific to the group creation process.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( bp_is_groups_component() && bp_is_current_action( 'create' ) && bp_user_can_create_groups() && isset( $_COOKIE['bp_new_group_id'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $bp->groups->new_group_id = (int) $_COOKIE['bp_new_group_id'];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // The base slug to filter the groups directory according to a group type.
+ $group_type_base = bp_get_groups_group_type_base();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the list of illegal groups names/slugs.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -350,27 +336,50 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $value Array of illegal group names/slugs.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->forbidden_names = apply_filters( 'groups_forbidden_names', array(
- 'my-groups',
- 'create',
- 'invites',
- 'send-invites',
- 'forum',
- 'delete',
- 'add',
- 'admin',
- 'request-membership',
- 'members',
- 'settings',
- 'avatar',
- $this->slug,
- $this->root_slug,
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->forbidden_names = apply_filters(
+ 'groups_forbidden_names',
+ array(
+ 'my-groups',
+ 'create',
+ 'invites',
+ 'send-invites',
+ 'forum',
+ 'delete',
+ 'add',
+ 'admin',
+ 'request-membership',
+ 'members',
+ 'settings',
+ 'avatar',
+ $this->slug,
+ $this->root_slug,
+ $group_type_base,
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If the user was attempting to access a group, but no group by that name was found, 404.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( bp_is_groups_component() && empty( $this->current_group ) && empty( $this->current_directory_type ) && bp_current_action() && ! in_array( bp_current_action(), $this->forbidden_names ) ) {
- bp_do_404();
- return;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( bp_is_groups_component() && empty( $this->current_group ) && bp_current_action() ) {
+
+ // Set group type if available.
+ if ( bp_is_current_action( bp_get_groups_group_type_base() ) && bp_action_variable() ) {
+ $matched_type = '';
+ $matched_types = bp_groups_get_group_types(
+ array(
+ 'has_directory' => true,
+ 'directory_slug' => bp_action_variable(),
+ )
+ );
+
+ // Set our directory type marker.
+ if ( ! empty( $matched_types ) ) {
+ $this->current_directory_type = reset( $matched_types );
+ }
+ }
+
+ if ( ! $this->current_directory_type && ! in_array( bp_current_action(), $this->forbidden_names, true ) ) {
+ bp_do_404();
+ return;
+ }
</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"> // Set default Group creation steps.
</span></span></pre></div>
<a id="trunksrcbpgroupsclassesclassbpgroupsthemecompatphp"></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/classes/class-bp-groups-theme-compat.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-groups/classes/class-bp-groups-theme-compat.php 2023-04-04 01:58:33 UTC (rev 13447)
+++ trunk/src/bp-groups/classes/class-bp-groups-theme-compat.php 2023-04-07 07:47:34 UTC (rev 13448)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -36,8 +36,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function is_group() {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Bail if not looking at a group.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! bp_is_groups_component() )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! bp_is_groups_component() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Group Directory.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( bp_is_groups_directory() ) {
</span></span></pre></div>
<a id="trunktestsphpunittestcasesroutinggroupsphp"></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/routing/groups.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/testcases/routing/groups.php 2023-04-04 01:58:33 UTC (rev 13447)
+++ trunk/tests/phpunit/testcases/routing/groups.php 2023-04-07 07:47:34 UTC (rev 13448)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -74,9 +74,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_group_directory_should_404_for_group_types_that_have_no_directory() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->set_permalink_structure( '/%postname%/' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- bp_register_member_type( 'foo', array( 'has_directory' => false ) );
- $this->go_to( bp_get_members_directory_permalink() . 'type/foo/' );
- $this->assertTrue( is_404() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ bp_groups_register_group_type( 'taz', array( 'has_directory' => false ) );
+ $this->go_to( bp_get_groups_directory_permalink() . 'type/taz/' );
+ $this->assertEmpty( bp_get_current_group_directory_type() );
</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">@@ -84,8 +84,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_group_directory_should_404_for_invalid_group_types() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->set_permalink_structure( '/%postname%/' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->go_to( bp_get_members_directory_permalink() . 'type/foo/' );
- $this->assertTrue( is_404() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->go_to( bp_get_groups_directory_permalink() . 'type/zat/' );
+ $this->assertEmpty( bp_get_current_group_directory_type() );
</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>