Changeset 4506 for trunk/bp-core/bp-core-catchuri.php

Timestamp:

06/13/2011 09:54:52 PM (15 years ago)

Author:

boonebgorges

Message:

Introduces bp_do_404() for easy 404ing. Corrects invalid path handling throughout, using bp_do_404(). Fixes #3280. Props DJPaul

File:

• trunk/bp-core/bp-core-catchuri.php (modified) (4 diffs)

trunk/bp-core/bp-core-catchuri.php

@@ -243 +243 @@
                                         $bp->displayed_user->id = (int) bp_core_get_userid_from_nicename( urldecode( $bp_uri[$uri_offset + 1] ) );
 
+                                if ( empty( $bp->displayed_user->id ) ) {
+                                        // Prevent components from loading their templates
+                                        $bp->current_component = ''; 
+
+                                        bp_do_404();
+                                        return;
+                                }
+
                                 // Bump the offset
                                 if ( isset( $bp_uri[$uri_offset + 2] ) ) {
@@ -352 +360 @@
  */
 function bp_core_catch_no_access() {
-        global $bp, $wp_query, $bp_unfiltered_uri, $bp_no_status_set;
+        global $bp, $bp_no_status_set;
 
         // If bp_core_redirect() and $bp_no_status_set is true,
@@ -359 +367 @@
                 return false;
 
-        // If the displayed user was marked as a spammer and the logged-in user is not a super admin, redirect
+        // If the displayed user was marked as a spammer and the logged-in user is not a super admin, 404.
         if ( isset( $bp->displayed_user->id ) && bp_core_is_user_spammer( $bp->displayed_user->id ) ) {
-                if ( !is_super_admin() )
-                        bp_core_redirect( $bp->root_domain );
-                else
+                if ( !$bp->loggedin_user->is_super_admin ) {
+                        bp_do_404();
+                        return;
+
+                } else {
                         bp_core_add_message( __( 'This user has been marked as a spammer. Only site admins can view this profile.', 'buddypress' ), 'error' );
-        }
-
-        // If BP_ENABLE_ROOT_PROFILES is not defined and the displayed user does not exist, redirect
-        if ( !$bp->displayed_user->id && isset( $bp_unfiltered_uri[0] ) && $bp_unfiltered_uri[0] == $bp->members->slug && isset( $bp_unfiltered_uri[1] ) )
-                bp_core_redirect( $bp->root_domain );
-
-        // Access control!
+                }
+        }
+
         if ( !isset( $wp_query->queried_object ) && !bp_is_blog_page() ) {
-                if ( is_user_logged_in() ) {
-                        bp_core_no_access( array( 'redirect' => false, 'message' => __( 'You do not have access to that page', 'buddypress' ) ) );
-                } else {
-                        bp_core_no_access();
-                }
+                bp_do_404();
         }
 }
@@ -402 +404 @@
         $r = wp_parse_args( $args, $defaults );
         extract( $r, EXTR_SKIP );
-
-        // Group filtering
-        // When a user doesn't have access to a group's activity / secondary page, redirect to group's homepage
-        if ( !$redirect ) {
-                if ( bp_is_active( 'groups' ) && bp_is_current_component( 'groups' ) ) {
-                        $root = bp_get_group_permalink( $bp->groups->current_group );
-                        $message = false;
-                }
-        }
 
         // Apply filters to these variables