Changeset 13448

Timestamp:

04/07/2023 07:47:34 AM (18 months ago)

Author:

imath

Message:

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 #8866

Location:

trunk

Files:

• src/bp-core/bp-core-template.php (modified) (1 diff)
• src/bp-groups/classes/class-bp-groups-component.php (modified) (2 diffs)
• src/bp-groups/classes/class-bp-groups-theme-compat.php (modified) (1 diff)
• tests/phpunit/testcases/routing/groups.php (modified) (2 diffs)

trunk/src/bp-core/bp-core-template.php

@@ -2780 +2780 @@
  */
 function bp_is_groups_directory() {
-    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;
-    }
-
-    return false;
+    $return = false;
+
+    if ( bp_is_groups_component() && ! bp_is_group() ) {
+        $return = ! bp_current_action() || ! empty( buddypress()->groups->current_directory_type );
+    }
+
+    return $return;
 }
 

trunk/src/bp-groups/classes/class-bp-groups-component.php

@@ -322 +322 @@
         }
 
-        // 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 );
-        }
-
         // Set up variables specific to the group creation process.
         if ( bp_is_groups_component() && bp_is_current_action( 'create' ) && bp_user_can_create_groups() && isset( $_COOKIE['bp_new_group_id'] ) ) {
             $bp->groups->new_group_id = (int) $_COOKIE['bp_new_group_id'];
         }
+
+        // The base slug to filter the groups directory according to a group type.
+        $group_type_base = bp_get_groups_group_type_base();
 
         /**
@@ -351 +337 @@
          * @param array $value Array of illegal group names/slugs.
          */
-        $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,
-        ) );
+        $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,
+            )
+        );
 
         // If the user was attempting to access a group, but no group by that name was found, 404.
-        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;
+        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;
+            }
         }
 

trunk/src/bp-groups/classes/class-bp-groups-theme-compat.php

@@ -37 +37 @@
 
         // Bail if not looking at a group.
-        if ( ! bp_is_groups_component() )
+        if ( ! bp_is_groups_component() ) {
             return;
+        }
 
         // Group Directory.

trunk/tests/phpunit/testcases/routing/groups.php

@@ -75 +75 @@
     public function test_group_directory_should_404_for_group_types_that_have_no_directory() {
         $this->set_permalink_structure( '/%postname%/' );
-        bp_register_member_type( 'foo', array( 'has_directory' => false ) );
-        $this->go_to( bp_get_members_directory_permalink() . 'type/foo/' );
-        $this->assertTrue( is_404() );
+        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() );
     }
 
@@ -85 +85 @@
     public function test_group_directory_should_404_for_invalid_group_types() {
         $this->set_permalink_structure( '/%postname%/' );
-        $this->go_to( bp_get_members_directory_permalink() . 'type/foo/' );
-        $this->assertTrue( is_404() );
+        $this->go_to( bp_get_groups_directory_permalink() . 'type/zat/' );
+        $this->assertEmpty( bp_get_current_group_directory_type() );
     }