Changeset 392

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.

Location:

trunk

Files:

• bp-core.php (modified) (3 diffs)
• bp-core/bp-core-catchuri.php (modified) (4 diffs)
• bp-core/bp-core-cssjs.php (modified) (1 diff)
• bp-core/bp-core-templatetags.php (modified) (1 diff)
• bp-groups.php (modified) (2 diffs)

trunk/bp-core.php

@@ -42 +42 @@
     global $current_user, $current_component, $current_action;
     global $action_variables;
-
+    
     /* The user ID of the user who is currently logged in. */
     $bp['loggedin_userid'] = $current_user->ID;
@@ -1034 +1034 @@
     global $bp;
     
-    if ( !is_user_logged_in() )
+    if ( !is_user_logged_in() || !get_usermeta( $bp['loggedin_userid'], 'last_activity') )
         return false;
     
@@ -1111 +1111 @@
 add_action( 'get_comment_author_link', 'bp_core_replace_comment_author_link', 10, 4 );
 
+/**
+ * bp_core_get_site_path()
+ *
+ * Get the path of of the current site.
+ * 
+ * @package BuddyPress Core
+ * @global $comment WordPress comment global for the current comment.
+ * @uses bp_core_get_userlink_by_email() Fetches a userlink via email address.
+ */
+function bp_core_get_site_path() {
+    global $wpdb;
+    
+    return $wpdb->get_var( $wpdb->prepare( "SELECT path FROM {$wpdb->base_prefix}site WHERE id = 1") );
+}
 
 /**

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 */

trunk/bp-core/bp-core-cssjs.php

@@ -38 +38 @@
  */
 function bp_core_add_css() {
-    if ( is_user_logged_in() ) {
+    if ( is_user_logged_in() && bp_core_user_has_home() ) {
         wp_enqueue_style( 'bp-admin-bar', site_url() . '/wp-content/mu-plugins/bp-core/css/admin-bar.css' );
         wp_print_styles();

trunk/bp-core/bp-core-templatetags.php

@@ -302 +302 @@
 
 function bp_loggedinuser_link() {
-    global $bp;
-    echo bp_core_get_userlink( $bp['loggedin_userid'] );
+    global $bp, $current_user;
+    
+    if ( $link = bp_core_get_userlink( $bp['loggedin_userid'] ) ) {
+        echo $link;
+    } else {
+        $ud = get_userdata($current_user->ID);
+        echo $ud->user_login;
+    }
 }
 

trunk/bp-groups.php

@@ -237 +237 @@
     bp_core_set_uri_globals();
     $groups_bp = groups_setup_globals(true);
-    
+
     if ( $current_component == $groups_bp['groups']['slug'] )
         $is_single_group = BP_Groups_Group::group_exists( $current_action, $groups_bp['groups']['table_name'] );
@@ -342 +342 @@
     if ( isset($_COOKIE['group_obj_id']) && !$group_obj && !$no_instantiate )
         $group_obj = new BP_Groups_Group( (int)$_COOKIE['group_obj_id'] );
-
+    
     bp_catch_uri( 'groups/create' );
 }