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

Timestamp:

10/12/2008 11:58:11 PM (18 years ago)

Author:

apeatling

Message:

Fixed catch-uri functions so that BuddyPress no longer has to be installed in the root of a site.

File:

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

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

@@ -17 +17 @@
  *   - VHOST: http:// andy.domain.com / [current_component] / [current_action] / [action_variables] / [action_variables] / ...
  *   - NO VHOST: http:// domain.com / andy / [current_component] / [current_action] / [action_variables] / [action_variables] / ...
+ *   - OUTSIDE ROOT: http:// domain.com / sites / buddypress / andy / [current_component] / [current_action] / [action_variables] / [action_variables] / ...
  * 
- * Example:
+ *      Example:
  *    - http://andy.domain.com/profile/edit/group/5/
  *    - $current_component: string 'profile'
@@ -28 +29 @@
 function bp_core_set_uri_globals() {
         global $current_component, $current_action, $action_variables;
-        
+
         /* Fetch the current URI and explode each part seperated by '/' into an array */
         $bp_uri = explode( "/", $_SERVER['REQUEST_URI'] );
-
-        /* This is used to determine where the component and action indexes should start */
-        $root_components = explode( ',', BP_CORE_ROOT_COMPONENTS );
-        $is_root_component = in_array( $bp_uri[1], $root_components );
         
         /* Set the indexes, these are incresed by one if we are not on a VHOST install */
         $component_index = 0;
-        $action_index = 1;
+        $action_index = $component_index + 1;
+        
+        /* Get site path items */
+        $paths = explode( '/', bp_core_get_site_path() );
 
-        if ( VHOST == 'no' && !$is_root_component ) {
-                $component_index++;
-                $action_index++;
-        }
+        /* Take empties off the end */
+        if ( $paths[count($paths) - 1] == "" )
+                array_pop( $paths );
 
+        /* Take empties off the start */
+        if ( $paths[0] == "" )
+                array_shift( $paths );
+        
         /* Take empties off the end */
         if ( $bp_uri[count($bp_uri) - 1] == "" )
@@ -52 +55 @@
         if ( $bp_uri[0] == "" )
                 array_shift( $bp_uri );
-
+                
         /* Get total URI segment count */
         $bp_uri_count = count( $bp_uri ) - 1;
+
+        for ( $i = 0; $i < $bp_uri_count; $i++ ) {
+                if ( in_array( $bp_uri[$i], $paths )) {
+                        unset( $bp_uri[$i] );
+                }
+        }
         
+        /* Reset the keys by merging with an empty array */
+        $bp_uri = array_merge( array(), $bp_uri );
+        
+        /* This is used to determine where the component and action indexes should start */
+        $root_components = explode( ',', BP_CORE_ROOT_COMPONENTS );
+        $is_root_component = in_array( $bp_uri[0], $root_components );
+        
+        if ( VHOST == 'no' && !$is_root_component ) {
+                $component_index++;
+                $action_index++;
+        }
+
         /* Set the current component */
         $current_component = $bp_uri[$component_index];
@@ -65 +86 @@
         $action_variables = $bp_uri;
 
-        /* Remove the username from action variables if this is not a VHOST install */
-        if ( VHOST == 'no' )
-                unset($action_variables[0]);
-
         /* Unset the current_component and action from action_variables */
         unset($action_variables[$component_index]);
         unset($action_variables[$action_index]);
+
+        /* Remove the username from action variables if this is not a VHOST install */
+        if ( VHOST == 'no' && !$is_root_component )
+                array_shift($action_variables);
         
         /* Reset the keys by merging with an empty array */