Changeset 394

Timestamp:

10/23/2008 12:56:37 PM (17 years ago)

Author:

apeatling

Message:

Removed home base requirement

Location:

trunk

Files:

• bp-activity.php (modified) (4 diffs)
• bp-activity/bp-activity-classes.php (modified) (1 diff)
• bp-blogs.php (modified) (10 diffs)
• bp-core.php (modified) (19 diffs)
• bp-core/admin-mods (deleted)
• bp-core/bp-core-adminbar.php (modified) (2 diffs)
• bp-core/bp-core-ajax-handler.php (modified) (1 diff)
• bp-core/bp-core-ajax.php (modified) (2 diffs)
• bp-core/bp-core-avatars.php (modified) (10 diffs)
• bp-core/bp-core-catchuri.php (modified) (7 diffs)
• bp-core/bp-core-classes.php (modified) (3 diffs)
• bp-core/bp-core-cssjs.php (modified) (2 diffs)
• bp-core/bp-core-templatetags.php (modified) (3 diffs)
• bp-core/bp-core-widgets.php (modified) (2 diffs)
• bp-core/css/directory-members.css (added)
• bp-core/directories (added)
• bp-core/directories/bp-core-directory-members.php (added)
• bp-core/homebase-creation (deleted)
• bp-core/js/directory-members.js (added)
• bp-friends.php (modified) (2 diffs)
• bp-groups.php (modified) (5 diffs)
• bp-groups/bp-groups-classes.php (modified) (3 diffs)
• bp-xprofile.php (modified) (4 diffs)
• bp-xprofile/admin-mods (added)
• bp-xprofile/admin-mods/bp-xprofile-account-tab.php (added)
• bp-xprofile/admin-mods/bp-xprofile-admin-mods.php (added)
• bp-xprofile/bp-xprofile-signup.php (modified) (5 diffs)
• bp-xprofile/bp-xprofile-templatetags.php (modified) (3 diffs)
• buddypress-theme/buddypress (deleted)
• buddypress-theme/home (deleted)

trunk/bp-activity.php

@@ -96 +96 @@
     
     $bp['activity'] = array(
-        'table_name_loggedin_user' => $wpdb->base_prefix . $bp['loggedin_homebase_id'] . '_activity',
-        'table_name_loggedin_user_cached' => $wpdb->base_prefix . $bp['loggedin_homebase_id'] . '_activity_cached',
-        
-        'table_name_current_user' => $wpdb->base_prefix . $bp['current_homebase_id'] . '_activity',
-        'table_name_current_user_cached' => $wpdb->base_prefix . $bp['current_homebase_id'] . '_activity_cached',
-        
-        'table_name_loggedin_user_friends_cached' => $wpdb->base_prefix . $bp['loggedin_homebase_id'] . '_friends_activity_cached',
+        'table_name_loggedin_user' => $wpdb->base_prefix . 'user_' . $bp['loggedin_userid'] . '_activity',
+        'table_name_loggedin_user_cached' => $wpdb->base_prefix . 'user_' . $bp['loggedin_userid'] . '_activity_cached',
+        
+        'table_name_current_user' => $wpdb->base_prefix . 'user_' . $bp['current_userid'] . '_activity',
+        'table_name_current_user_cached' => $wpdb->base_prefix . 'user_' . $bp['current_userid'] . '_activity_cached',
+        
+        'table_name_loggedin_user_friends_cached' => $wpdb->base_prefix . 'user_' . $bp['loggedin_userid'] . '_friends_activity_cached',
         'table_name_sitewide' => $wpdb->base_prefix . 'bp_activity_sitewide',
         
@@ -115 +115 @@
     }
 }
-add_action( 'wp', 'bp_activity_setup_globals', 1 ); 
+add_action( 'wp', 'bp_activity_setup_globals', 1 );
 add_action( '_admin_menu', 'bp_activity_setup_globals', 1 );
 
@@ -180 +180 @@
 /***** Actions **********/
 
-function bp_activity_record( $item_id, $component_name, $component_action, $is_private, $dual_record = false, $secondary_user_homebase_id = false ) {
+function bp_activity_record( $item_id, $component_name, $component_action, $is_private, $dual_record = false ) {
     global $bp, $wpdb;
 
@@ -196 +196 @@
     /* Save an activity entry for both logged in and secondary user. For example for a new friend connection
        you would want to show "X and Y are now friends" on both users activity stream */
-    if ( $dual_record && $secondary_user_homebase_id ) {
+    if ( $dual_record  ) {
         $table_name = $wpdb->base_prefix . $secondary_user_homebase_id . '_activity';
         $table_name_cached = $wpdb->base_prefix . $secondary_user_homebase_id . '_activity_cached';

trunk/bp-activity/bp-activity-classes.php

@@ -186 +186 @@
         
             for ( $i = 0; $i < count($friend_ids); $i++ ) {
-                $homebase_id = get_usermeta( $friend_ids[$i], 'home_base' );
-                $table_name = $wpdb->base_prefix . $homebase_id . '_activity_cached';
+                $table_name = $wpdb->base_prefix . $field_ids[$i] . '_activity_cached';
             
                 $activities[$i]['activity'] = $wpdb->get_results( $wpdb->prepare( "SELECT content, date_recorded, component_name FROM " . $table_name . " WHERE is_private = 0 ORDER BY date_recorded LIMIT 5" ) );

trunk/bp-blogs.php

@@ -250 +250 @@
 
 
-function bp_blogs_record_blog( $blog_id = '', $user_id = '' ) {
+function bp_blogs_record_blog( $blog_id, $user_id ) {
     global $bp;
     
@@ -261 +261 @@
         $user_id = $bp['loggedin_userid'];
     
-    if ( !get_usermeta( $user_id, 'home_base' ) )
-        return false;
-        
-    if ( (int)$blog_id != (int)get_usermeta( $user_id, 'home_base' ) ) {        
-        $recorded_blog = new BP_Blogs_Blog;
-        $recorded_blog->user_id = $user_id;
-        $recorded_blog->blog_id = $blog_id;
-
-        $recorded_blog_id = $recorded_blog->save();
-        
-        do_action( 'bp_blogs_new_blog', array( 'item_id' => $recorded_blog_id, 'component_name' => 'blogs', 'component_action' => 'new_blog', 'is_private' => 0 ) );
-    }
-}
-add_action( 'wpmu_new_blog', 'bp_blogs_record_blog', 10 );
-
-function bp_blogs_record_post($post_id = '') {
+    $recorded_blog = new BP_Blogs_Blog;
+    $recorded_blog->user_id = $user_id;
+    $recorded_blog->blog_id = $blog_id;
+    
+    $recorded_blog_id = $recorded_blog->save();
+    
+    do_action( 'bp_blogs_new_blog', array( 'item_id' => $recorded_blog_id, 'component_name' => 'blogs', 'component_action' => 'new_blog', 'is_private' => 0 ) );
+}
+add_action( 'wpmu_new_blog', 'bp_blogs_record_blog', 10, 2 );
+
+
+function bp_blogs_record_post($post_id) {
     global $bp, $current_blog;
     
@@ -325 +321 @@
 add_action( 'publish_post', 'bp_blogs_record_post' );
 
-function bp_blogs_record_comment( $comment_id = '', $from_ajax = false ) {
+function bp_blogs_record_comment( $comment_id, $from_ajax = false ) {
     global $bp, $current_blog, $current_user;
 
@@ -376 +372 @@
     }
 }
-add_action( 'comment_post', 'bp_blogs_record_comment' );
-add_action( 'edit_comment', 'bp_blogs_record_comment' );
-
-
-function bp_blogs_modify_comment( $comment_id = '', $comment_status = '' ) {
+add_action( 'comment_post', 'bp_blogs_record_comment', 10, 2 );
+add_action( 'edit_comment', 'bp_blogs_record_comment', 10, 2 );
+
+
+function bp_blogs_modify_comment( $comment_id, $comment_status ) {
     global $bp;
     
@@ -397 +393 @@
     }
 }
-add_action( 'wp_set_comment_status', 'bp_blogs_modify_comment' );
-
-function bp_blogs_remove_blog( $blog_id = '' ) {
+add_action( 'wp_set_comment_status', 'bp_blogs_modify_comment', 10, 2 );
+
+function bp_blogs_remove_blog( $blog_id ) {
     $blog_id = (int)$blog_id;
 
@@ -406 +402 @@
 add_action( 'delete_blog', 'bp_blogs_remove_blog' );
 
-function bp_blogs_remove_blog_for_user( $user_id = '', $blog_id = '' ) {
+function bp_blogs_remove_blog_for_user( $user_id, $blog_id ) {
     $blog_id = (int)$blog_id;
     $user_id = (int)$user_id;
@@ -412 +408 @@
     BP_Blogs_Blog::delete_blog_for_user( $blog_id, $user_id );
 }
-add_action( 'remove_user_from_blog', 'bp_blogs_remove_blog' );
-
-function bp_blogs_remove_post( $post_id = '' ) {
+add_action( 'remove_user_from_blog', 'bp_blogs_remove_blog', 10, 2 );
+
+function bp_blogs_remove_post( $post_id ) {
     global $current_blog, $bp;
     
@@ -429 +425 @@
 add_action( 'delete_post', 'bp_blogs_remove_post' );
 
-function bp_blogs_remove_comment( $comment_id = '' ) {
+function bp_blogs_remove_comment( $comment_id ) {
     global $current_blog, $bp;
     
@@ -445 +441 @@
 
 function bp_blogs_remove_data( $blog_id ) {
-
-    if ( $user_id = bp_core_get_homebase_userid( $blog_id ) ) {
-        /* If this is a home base, delete everything for that user. */
-        BP_Blogs_Blog::delete_blogs_for_user( $user_id );
-        BP_Blogs_Post::delete_posts_for_user( $user_id );
-        BP_Blogs_Comment::delete_comments_for_user( $user_id );
-    } else {
-        /* If this is regular blog, delete all data for that blog. */
-        BP_Blogs_Blog::delete_blog_for_all( $blog_id );
-        BP_Blogs_Post::delete_posts_for_blog( $blog_id );       
-        BP_Blogs_Comment::delete_comments_for_blog( $blog_id );
-    }
-    
+    /* If this is regular blog, delete all data for that blog. */
+    BP_Blogs_Blog::delete_blog_for_all( $blog_id );
+    BP_Blogs_Post::delete_posts_for_blog( $blog_id );       
+    BP_Blogs_Comment::delete_comments_for_blog( $blog_id );
 }
 add_action( 'delete_blog', 'bp_blogs_remove_data', 1 );
@@ -474 +461 @@
     if ( is_array($blogs) ) {
         foreach ( $blogs as $blog ) {
-            if ( (int)$blog->userblog_id != (int)get_usermeta( $user_id, 'home_base' ) ) {
-                bp_blogs_record_blog( (int)$blog->userblog_id, (int)$user_id );
-
-                switch_to_blog( $blog->userblog_id );
-                $posts_for_blog = bp_core_get_all_posts_for_user( $user_id );
-            
-                for ( $i = 0; $i < count($posts); $i++ ) {
-                    bp_blogs_record_post( $posts[$i] );
-                }
+            bp_blogs_record_blog( (int)$blog->userblog_id, (int)$user_id );
+
+            switch_to_blog( $blog->userblog_id );
+            $posts_for_blog = bp_core_get_all_posts_for_user( $user_id );
+        
+            for ( $i = 0; $i < count($posts); $i++ ) {
+                bp_blogs_record_post( $posts[$i] );
             }
         }

trunk/bp-core.php

@@ -5 +5 @@
 /* These components are accessed via the root, and not under a blog name or home base.
    e.g Groups is accessed via: http://domain.com/groups/group-name NOT http://domain.com.andy/groups/group-name */
-define( 'BP_CORE_ROOT_COMPONENTS', 'groups' );
-
-/* Require all needed files */
+define( 'BP_CORE_ROOT_COMPONENTS', 'groups,members' );
+
+/* Functions to handle pretty URLs and breaking them down into usable variables */
 require_once( 'bp-core/bp-core-catchuri.php' );
+
+/* Database access classes */
 require_once( 'bp-core/bp-core-classes.php' );
+
+/* Functions to control the inclusion of CSS and JS files */
 require_once( 'bp-core/bp-core-cssjs.php' );
+
+/* Functions that handle the uploading, cropping, validation and storing of avatars */
 require_once( 'bp-core/bp-core-avatars.php' );
+
+/* Template functions/tags that can be used in template files */
 require_once( 'bp-core/bp-core-templatetags.php' );
+
+/* Functions to enable the site wide administration bar */
 require_once( 'bp-core/bp-core-adminbar.php' );
+
+/* Bundled core widgets that can be dropped into themes */
 require_once( 'bp-core/bp-core-widgets.php' );
+
+/* AJAX functionality */
 require_once( 'bp-core/bp-core-ajax.php' );
-require_once( 'bp-core/admin-mods/bp-core-remove-blogtabs.php' );
-require_once( 'bp-core/admin-mods/bp-core-admin-styles.php' );
-require_once( 'bp-core/homebase-creation/bp-core-homebase-functions.php' );
+
+/* Functions to handle and display the member and blog directory pages */
+require_once( 'bp-core/directories/bp-core-directory-members.php' );
+
+
+/* "And now for something completely different" .... */
 
 
@@ -40 +57 @@
 function bp_core_setup_globals() {
     global $bp;
-    global $current_user, $current_component, $current_action;
+    global $current_user, $current_component, $current_action, $current_blog;
+    global $current_userid;
     global $action_variables;
+
+    /* The domain for the root of the site where the main blog resides */   
+    $bp['root_domain'] = bp_core_get_root_domain();
     
     /* The user ID of the user who is currently logged in. */
     $bp['loggedin_userid'] = $current_user->ID;
     
-    /* The domain for the user currently logged in. eg: http://andy.domain.com/ */
-    $bp['loggedin_domain'] = bp_core_get_loggedin_domain();
+    /* The user id of the user currently being viewed */
+    $bp['current_userid'] = $current_userid;
+    
+    /* The domain for the user currently logged in. eg: http://domain.com/members/andy */
+    $bp['loggedin_domain'] = bp_core_get_user_domain($current_user->ID);
     
     /* The domain for the user currently being viewed */
-    $bp['current_domain'] = bp_core_get_current_domain();
-    
-    /* The user id of the user currently being viewed */
-    $bp['current_userid'] = bp_core_get_current_userid();
+    $bp['current_domain'] = bp_core_get_user_domain($current_userid);
     
     /* The component being used eg: http://andy.domain.com/ [profile] */
@@ -90 +111 @@
     /* Sets up container for callback message type rendered by bp_core_render_notice() */
     $bp['message_type'] = ''; // error/success
-    
-    /* Fetch the home base blog id for the logged in and current user */
-    $bp['loggedin_homebase_id'] = get_usermeta( $bp['loggedin_userid'], 'home_base' );
-    $bp['current_homebase_id'] = get_usermeta( $bp['current_userid'], 'home_base' );
-    
+
     /* Fetch the full name for the logged in and current user */
     $bp['loggedin_fullname'] = bp_core_global_user_fullname( $bp['loggedin_userid'] );
@@ -115 +132 @@
 add_action( '_admin_menu', 'bp_core_setup_globals', 1 ); // must be _admin_menu hook.
 
-/**
- * bp_core_component_exists()
- *
- * Check to see if a component with the given name actually exists.
- * If not, redirect to the 404.
- * 
- * @package BuddyPress Core
- * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
- * @return false if no, or true if yes.
- */
-function bp_core_component_exists() {
-    global $bp, $wpdb;
-
-    if ( $wpdb->blogid == $bp['current_homebase_id'] ) {
-        $component_check = $bp['current_component'];
-
-        if ( strpos( $component_check, 'activate.php' ) )
-            return true;
-
-        if ( empty($bp[$component_check]) ) {
-            status_header('404');
-            load_template( TEMPLATEPATH . '/header.php'); 
-            load_template( TEMPLATEPATH . '/404.php');
-            load_template( TEMPLATEPATH . '/footer.php');
-            die;
+function bp_core_setup_nav() {
+    global $bp;
+    
+    if ( !function_exists('xprofile_install') ) {
+        /* Add 'Profile' to the main navigation */
+        bp_core_add_nav_item( __('Profile', 'buddypress'), 'profile' );
+        bp_core_add_nav_default( 'profile', 'bp_core_catch_profile_uri', 'public' );
+
+        $profile_link = $bp['loggedin_domain'] . '/profile/';
+
+        /* Add the subnav items to the profile */
+        bp_core_add_subnav_item( 'profile', 'public', __('Public', 'buddypress'), $profile_link, 'xprofile_screen_display_profile' );
+
+        if ( $bp['current_component'] == 'profile' ) {
+            if ( bp_is_home() ) {
+                $bp['bp_options_title'] = __('My Profile', 'buddypress');
+            } else {
+                $bp['bp_options_avatar'] = bp_core_get_avatar( $bp['current_userid'], 1 );
+                $bp['bp_options_title'] = $bp['current_fullname']; 
+            }
         }
     }
 }
-add_action( 'wp', 'bp_core_component_exists', 10 );
-
-
-/**
- * bp_core_add_settings_tab()
- *
- * Adds a custom settings tab to the home base for the user
- * in the admin area.
- * 
- * @package BuddyPress Core
- * @global $menu The global WordPress admin navigation menu.
- */
-function bp_core_add_settings_tab() {
-    global $menu;
-    
-    $account_settings_tab = add_menu_page( __('Account', 'buddypress'), __('Account', 'buddypress'), 10, 'bp-core/admin-mods/bp-core-account-tab.php' );
-}
-add_action( 'admin_menu', 'bp_core_add_settings_tab' );
-
-/**
- * bp_core_get_loggedin_domain()
- *
- * Returns the domain for the user that is currently logged in.
- * eg: http://andy.domain.com/ or http://domain.com/andy/
+add_action( 'wp', 'bp_core_setup_nav', 2 );
+
+/**
+ * bp_core_get_user_domain()
+ *
+ * Returns the domain for the passed user:
+ * e.g. http://domain.com/members/andy/
  * 
  * @package BuddyPress Core
  * @global $current_user WordPress global variable containing current logged in user information
- * @param optional user_id
- * @uses get_usermeta() WordPress function to get the usermeta for a current user.
- */
-function bp_core_get_loggedin_domain( $user_id = null ) {
-    global $current_user;
-    
-    if ( !$user_id )
-        $user_id = $current_user->ID;
-    
-    /* Get the ID of the home base blog */
-    if ( $home_base_id = get_usermeta( $user_id, 'home_base' ) )
-        return get_blog_option( $home_base_id, 'siteurl' ) . '/';
-    else
-        return false;
-}
-
-/**
- * bp_core_get_current_domain()
- *
- * Returns the domain for the user that is currently being viewed.
- * eg: http://andy.domain.com/ or http://domain.com/andy/
+ * @param user_id The ID of the user.
+ * @uses get_usermeta() WordPress function to get the usermeta for a user.
+ */
+function bp_core_get_user_domain( $user_id ) {
+    global $bp;
+    
+    if ( !$user_id ) return;
+    
+    $ud = get_userdata($user_id);
+    
+    return $bp['root_domain'] . '/members/' . $ud->user_login . '/';
+}
+
+/**
+ * bp_core_get_root_domain()
+ *
+ * Returns the domain for the root blog.
+ * eg: http://domain.com/ OR https://domain.com
  * 
  * @package BuddyPress Core
  * @global $current_blog WordPress global variable containing information for the current blog being viewed.
- * @uses get_bloginfo() WordPress function to return the value of a blog setting based on param passed
- * @return $current_domain The domain for the user that is currently being viewed.
- */
-function bp_core_get_current_domain() {
+ * @uses switch_to_blog() WordPress function to switch to a blog of the given ID.
+ * @uses site_url() WordPress function to return the current site url.
+ * @return $domain The domain URL for the blog.
+ */
+function bp_core_get_root_domain() {
     global $current_blog;
     
-    return get_blog_option( $current_blog->blog_id, 'siteurl' ) . '/';
+    switch_to_blog(1);
+    $domain = site_url();
+    switch_to_blog($current_blog->blog_id);
+    
+    return $domain;
 }
 
@@ -214 +211 @@
  * @return $current_userid The user id for the user that is currently being viewed, return zero if this is not a user home and just a normal blog.
  */
-function bp_core_get_current_userid() {
-    global $current_blog, $current_user;
-    
-    if ( $current_blog->blog_id == 1 )
-        return $current_user->ID;
-        
-    /* Check to see if this is a user home, and if it is, get the user id */
-    if ( !$current_userid = bp_core_get_homebase_userid( $current_blog->blog_id ) )
-        return false; // return false if this is a normal blog, and not a user home.
-    
-    return $current_userid;
-}
-
-/**
- * bp_core_get_user_home_userid()
- *
- * Checks to see if there is user_home usermeta set for the current_blog.
- * If it is set, return the user_id, if not, return false.
- * 
- * @package BuddyPress Core
- * @param $blog_id The ID of the blog to check user_home metadata for.
- * @global $wpdb WordPress DB access object.
- * @return $current_userid The user id for the home base.
- */
-function bp_core_get_homebase_userid( $blog_id ) {
-    global $wpdb;
-    
-    return $wpdb->get_var( $wpdb->prepare( "SELECT user_id FROM " . $wpdb->base_prefix . "usermeta WHERE meta_key = 'home_base' AND meta_value = %d", $blog_id ) );
-}
-
-/**
- * bp_core_is_home_base()
- *
- * Checks a blog id to see if it is a home base or not.
- * 
- * @package BuddyPress Core
- * @param $blog_id The ID of the blog to check user_home metadata for.
- * @global $wpdb WordPress DB access object.
- * @return $current_userid The user id for the home base.
- */
-function bp_core_is_home_base( $blog_id ) {
-    global $wpdb;
-    
-    if ( $wpdb->get_var( $wpdb->prepare( "SELECT umeta_id FROM " . $wpdb->base_prefix . "usermeta WHERE meta_key = 'home_base' AND meta_value = %d", $blog_id ) ) )
-        return true;
-    
-    return false;
-}
-
-/**
- * bp_core_user_has_home()
- *
- * Checks to see if a user has assigned a blog as their user_home.
- * 
- * @package BuddyPress Core
- * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
- * @uses get_usermeta() WordPress function to get the usermeta for a current user.
- * @return false if no, or true if yes.
- */
-function bp_core_user_has_home( $user_id = false ) {
-    global $bp;
-
-    if ( !$user_id ) {
-        if ( $bp['loggedin_homebase_id'] == '' )
-            return false;
-
-        return $bp['loggedin_homebase_id'];
-    } else {
-        return get_usermeta( $user_id, 'home_base' );
-    }
-}
-
-/**
- * bp_core_get_primary_username()
- *
- * Returns the username based on http:// [username] .site.com OR http://site.com/ [username]
- * 
- * @package BuddyPress Core
- * @global $current_blog WordPress global containing information and settings for the current blog
- * @return $siteuser Username for current blog or user home.
- */
-function bp_core_get_primary_username() {
-    global $current_blog;
-    
-    if ( VHOST == 'yes' ) {
-        $siteuser = explode('.', $current_blog->domain);
-        $siteuser = $siteuser[0];
-    } else {
-        $siteuser = str_replace('/', '', $current_blog->path);
-    }
-    
-    return $siteuser;
-}
-
-/**
- * bp_core_start_buffer()
- *
- * Start the output buffer to replace content not easily accessible.
- * 
- * @package BuddyPress Core
- */
-function bp_core_start_buffer() {
-    ob_start();
-    add_action( 'dashmenu', 'bp_core_stop_buffer' );
-} 
-add_action( 'admin_menu', 'bp_core_start_buffer' );
-
-/**
- * bp_core_stop_buffer()
- *
- * Stop the output buffer to replace content not easily accessible.
- * 
- * @package BuddyPress Core
- */
-function bp_core_stop_buffer() {
-    $contents = ob_get_contents();
-    ob_end_clean();
-    bp_core_blog_switcher( $contents );
-}
-
-/**
- * bp_core_blog_switcher()
- *
- * Replaces the standard blog switcher included in the WordPress core so that
- * BuddyPress specific icons can be used in tabs and the order can be changed.
- * An output buffer is used, as the function cannot be overridden or replaced
- * any other way.
- * 
- * @package BuddyPress Core
- * @param $contents str The contents of the buffer.
- * @global $current_user obj WordPress global containing information and settings for the current user
- * @global $blog_id int WordPress global containing the current blog id
- * @return $siteuser Username for current blog or user home.
- */
-function bp_core_blog_switcher( $contents ) {
-    global $current_user, $blog_id; // current blog
-    
-    /* Code duplicated from wp-admin/includes/mu.php */
-    /* function blogswitch_markup() */
-    
-    $filter = preg_split( '/\<ul id=\"dashmenu\"\>[\S\s]/', $contents );
-    echo $filter[0];
-    
-    $list = array();
-    $options = array();
-
-    $home_base = get_usermeta( $current_user->ID, 'home_base' );
-    
-    foreach ( $blogs = get_blogs_of_user( $current_user->ID ) as $blog ) {
-        if ( !$blog->blogname )
-            continue;
-
-        // Use siteurl for this in case of mapping
-        $parsed = parse_url( $blog->siteurl );
-        $domain = $parsed['host'];
-        
-        if ( $blog->userblog_id == $home_base ) {
-            $current = ' id="primary_blog"';
-            $image   = ' style="background-image: url(' . get_option('home') . '/wp-content/mu-plugins/bp-core/images/member.png);
-                              background-position: 2px 4px;
-                              background-repeat: no-repeat;
-                              padding-left: 22px;"';
-        } else { 
-            $current = ''; 
-            $image   = ' style="background-image: url(' . get_option('home') . '/wp-content/mu-plugins/bp-core/images/blog.png);
-                              background-position: 3px 3px;
-                              background-repeat: no-repeat;
-                              padding-left: 22px;"';; 
-        }
-            
-        if ( VHOST == 'yes' ) {
-            if ( $_SERVER['HTTP_HOST'] === $domain ) {
-                $current  .= ' class="current"';
-                $selected  = ' selected="selected"';
-            } else {
-                $current  .= '';
-                $selected  = '';
-            }           
-        } else {
-            $path = explode( '/', str_replace( '/wp-admin', '', $_SERVER['REQUEST_URI'] ) );
-
-            if ( $path[1] == str_replace( '/', '', $blog->path ) ) {
-                $current  .= ' class="current"';
-                $selected  = ' selected="selected"';
-            } else {
-                $current  .= '';
-                $selected  = '';
-            }
-        }
-
-        $url = clean_url( $blog->siteurl ) . '/wp-admin/';
-        $name = wp_specialchars( strip_tags( $blog->blogname ) );
-        
-        $list_item   = "<li><a$image href='$url'$current>$name</a></li>";
-        $option_item = "<option value='$url'$selected>$name</option>";
-
-        $list[]    = $list_item;
-        $options[] = $option_item; // [sic] don't reorder dropdown based on current blog
-    
-    }
-    ksort($list);
-    ksort($options);
-
-    $list = array_slice( $list, 0, 4 ); // First 4
-
-    $select = "\n\t\t<select>\n\t\t\t" . join( "\n\t\t\t", $options ) . "\n\t\t</select>";
-
-    echo "<ul id=\"dashmenu\">\n\t" . join( "\n\t", $list );
-
-    if ( count($list) < count($options) ) :
-?>
-    <li id="all-my-blogs-tab" class="wp-no-js-hidden"><a href="#" class="blog-picker-toggle"><?php _e( 'All my blogs' , 'buddypress'); ?></a></li>
-
-    </ul>
-
-    <form id="all-my-blogs" action="" method="get" style="display: none">
-        <p>
-            <?php printf( __( 'Choose a blog: %s' , 'buddypress'), $select ); ?>
-
-            <input type="submit" class="button" value="<?php _e( 'Go' , 'buddypress'); ?>" />
-            <a href="#" class="blog-picker-toggle"><?php _e( 'Cancel' , 'buddypress'); ?></a>
-        </p>
-    </form>
-<?php
-    endif; // counts
-}
-
-/**
- * bp_core_replace_home_base_dashboard()
- *
- * Sets up the hook to start replacement of the dashboard on the users home base.
- * 
- * @package BuddyPress Core
- * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
- * @global $wpdb WordPress DB access object.
- * @uses add_action() Hooks a function on to a specific action.
- */
-function bp_core_replace_home_base_dashboard() {
-    global $wpdb, $bp;
-
-    if ( strpos( $_SERVER['SCRIPT_NAME'], '/index.php' ) && $wpdb->blogid == $bp['current_homebase_id'] ) {
-        add_action( 'admin_head', 'bp_core_start_dash_replacement' );
-    }   
-}
-add_action( 'admin_menu', 'bp_core_replace_home_base_dashboard' );
-
-/**
- * bp_core_start_dash_replacement()
- *
- * Starts the output buffer.
- * 
- * @package BuddyPress Core
- * @uses add_action() Hooks a function on to a specific action.
- */
-function bp_core_start_dash_replacement( $dash_contents ) { 
-    ob_start();
-    add_action('admin_footer', 'bp_core_end_dash_replacement');
-}
-
-/**
- * bp_core_insert_new_dashboard()
- *
- * Inserts the new dashboard content.
- * 
- * @package BuddyPress Core
- * @uses add_action() Hooks a function on to a specific action.
- */
-function bp_core_insert_new_dashboard( $dash_contents ) {
-    global $bp;
-    
-    $filter = preg_split( '/\<div class=\"wrap\"\>[\S\s]*\<div id=\"footer\"\>/', $dash_contents );
-
-    $filter[0] .= '<div class="wrap">';
-    $filter[1] .= '</div>';
-    
-    echo $filter[0];
-    //echo ABSPATH . 'wp-content/mu-plugins/bp-core/admin-mods/bp-core-homebase-dashboard.php';
-    require_once( ABSPATH . '/wp-content/mu-plugins/bp-core/admin-mods/bp-core-homebase-dashboard.php' );
-    
-    echo '<div style="clear: both">&nbsp;<br clear="all" /></div></div><div id="footer">';
-    echo $filter[1];
-}
-
-/**
- * bp_core_end_dash_replacement()
- *
- * Gets output buffer contents and stops the output buffer.
- * 
- * @package BuddyPress Core
- * @uses bp_core_insert_new_dashboard() Inserts the new dashboard content.
- */
-function bp_core_end_dash_replacement() {
-    $dash_contents = ob_get_contents();
-    ob_end_clean();
-    bp_core_insert_new_dashboard($dash_contents);
+function bp_core_get_current_userid( $user_login ) {
+    return bp_core_get_userid_from_user_login( $user_login );
 }
 
@@ -565 +269 @@
  * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
  */
-function bp_core_add_subnav_item( $parent_id, $slug, $name, $link, $function, $css_id = false, $loggedin_user_only = true, $admin_only = false ) {
-    global $bp;
-    
+function bp_core_add_subnav_item( $parent_id, $slug, $name, $link, $function, $css_id = false, $user_has_access = true, $admin_only = false ) {
+    global $bp;
+    
+    if ( !$user_has_access && !bp_core_is_home() )
+        return false;
+        
     if ( $admin_only && !is_site_admin() )
         return false;
@@ -580 +287 @@
     );
     
-    if ( $loggedin_user_only && !bp_is_home() )
-        return false;
-    
     if ( function_exists($function) && $bp['current_action'] == $slug && $bp['current_component'] == $parent_id )
         add_action( 'wp', $function, 3 );
@@ -616 +320 @@
 function bp_core_add_nav_default( $parent_id, $function, $slug = false ) {
     global $bp;
-        
+    
     if ( $bp['current_component'] == $parent_id && !$bp['current_action'] ) {
         if ( function_exists($function) ) {
@@ -646 +350 @@
 
 /**
+ * bp_core_get_userid_from_user_login()
+ *
+ * Returns the user_id from a user login
+ * @package BuddyPress Core
+ * @param $path str Path to check.
+ * @global $wpdb WordPress DB access object.
+ * @return false on no match
+ * @return int the user ID of the matched user.
+ */
+function bp_core_get_userid_from_user_login( $user_login ) {
+    global $wpdb;
+
+    return $wpdb->get_var( $wpdb->prepare( "SELECT ID from {$wpdb->base_prefix}users WHERE user_login = %s", $user_login ) );
+}
+
+/**
  * bp_core_get_username()
  *
@@ -682 +402 @@
  */
 function bp_core_get_userurl( $uid ) {
-    if ( $home_base_id = get_usermeta( $uid, 'home_base' ) )
-        return get_blog_option( $home_base_id, 'siteurl' ) . '/';
-    else
+    global $bp;
+    
+    if ( !is_numeric($uid) )
         return false;
+    
+    $ud = get_userdata($uid);
+        
+    return $bp['root_domain'] . '/members/' . $ud->user_login . '/';
 }
 
@@ -749 +473 @@
         return $display_name;
 
-    if ( $home_base_id = get_usermeta( $user_id, 'home_base' ) )
-        $home_base_url = get_blog_option( $home_base_id, 'siteurl' ) . '/';
-    else
+    if ( !$url = bp_core_get_userurl($user_id) )
         return false;
         
     if ( $just_link )
-        return $home_base_url;
-
-    return '<a href="' . $home_base_url . '">' . $display_name . '</a>';    
+        return $url;
+
+    return '<a href="' . $url . '">' . $display_name . '</a>';  
 }
 
 function bp_core_global_user_fullname( $user_id ) {
-    if ( function_exists('bp_user_fullname') ) {
+    if ( function_exists('bp_fetch_user_fullname') ) {
         return bp_fetch_user_fullname( $user_id, false );
     } else {
@@ -772 +494 @@
  * bp_core_get_userlink_by_email()
  *
- * Returns the email address for the user based on user ID
+ * Returns the user link for the user based on user email address
  * 
  * @package BuddyPress Core
@@ -783 +505 @@
     $user = get_user_by_email( $email );
     return bp_core_get_userlink( $user->ID, false, false, true );
+}
+
+/**
+ * bp_core_get_userlink_by_username()
+ *
+ * Returns the user link for the user based on user's username
+ * 
+ * @package BuddyPress Core
+ * @param $username str The username for the user.
+ * @uses bp_core_get_userlink() BuddyPress function to get a userlink by user ID.
+ * @return str The link to the users home base. False on no match.
+ */
+function bp_core_get_userlink_by_username( $username ) {
+    global $wpdb;
+    
+    $user_id = $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM {$wpdb->base_prefix}users WHERE user_login = %s", $username ) ); 
+    return bp_core_get_userlink( $user_id, false, false, true );
 }
 
@@ -852 +591 @@
 
 /**
- * bp_upload_dir()
- *
- * This function will create an upload directory for a new user.
+ * bp_avatar_upload_dir()
+ *
+ * This function will create an avatar upload directory for a new user.
  * This is directly copied from WordPress so that the code can be
  * accessed on user activation *before* 'upload_path' is placed
@@ -863 +602 @@
  * 
  * @package BuddyPress Core
- * @param $time str? The time so that upload folders can be created for month and day.
- * @param $blog_id int The ID of the blog (or user in BP) to create the upload dir for.
  * @return array Containing path, url, subdirectory and error message (if applicable).
  */
-function bp_upload_dir( $time = NULL, $blog_id ) {
-    $siteurl = get_option( 'siteurl' );
-    $upload_path = 'wp-content/blogs.dir/' . $blog_id . '/files';
+function bp_avatar_upload_dir( $user_id, $path = '/avatars' ) {
+    $siteurl = site_url();
+    $upload_path = 'wp-content/blogs.dir/1/files' . $path . '/' . $user_id;
     if ( trim($upload_path) === '' )
         $upload_path = 'wp-content/uploads';
@@ -885 +622 @@
     }
 
-    $subdir = '';
-    if ( get_option( 'uploads_use_yearmonth_folders' ) ) {
-        // Generate the yearly and monthly dirs
-        if ( !$time )
-            $time = current_time( 'mysql' );
-        $y = substr( $time, 0, 4 );
-        $m = substr( $time, 5, 2 );
-        $subdir = "/$y/$m";
-    }
-
-    $dir .= $subdir;
-    $url .= $subdir;
-    
     // Make sure we have an uploads dir
     if ( ! wp_mkdir_p( $dir ) ) {
+        echo "no dir"; die;
         $message = sprintf( __( 'Unable to create directory %s. Is its parent directory writable by the server?' , 'buddypress'), $dir );
         return array( 'error' => $message );
@@ -1105 +830 @@
     global $comment;
 
-    $bp_author_link = bp_core_get_userlink_by_email( $comment->comment_author_email );
-    
-    echo ( !$bp_author_link ) ? $author : $bp_author_link; 
-}
-add_action( 'get_comment_author_link', 'bp_core_replace_comment_author_link', 10, 4 );
+    if ( !$comment->comment_author_email ) {
+        $bp_author_link = bp_core_get_userlink_by_username( $comment->comment_author );
+    } else {
+        $bp_author_link = bp_core_get_userlink_by_email( $comment->comment_author_email );  
+    }
+    
+    return ( !$bp_author_link ) ? $author : $bp_author_link; 
+}
+add_filter( 'get_comment_author_link', 'bp_core_replace_comment_author_link', 10, 4 );
 
 /**
@@ -1150 +879 @@
                 unset($nav_array[$key]);
             break;
+            case 'profile':
+                $new_nav[1] = $nav_array[$key];
+                unset($nav_array[$key]);
+            break;
             case $bp['blogs']['slug']:
                 $new_nav[2] = $nav_array[$key];
@@ -1188 +921 @@
 
 function bp_core_remove_data( $user_id ) {
-    /* When the user is deleted, we must automatically delete their home base blog */
-    if ( $home_base_id = bp_core_user_has_home($user_id) )
-        wpmu_delete_blog( $home_base_id, true );
-    
     /* Remove usermeta */
-    delete_usermeta( $user_id, 'home_base' );
     delete_usermeta( $user_id, 'last_activity' );
 }

trunk/bp-core/bp-core-adminbar.php

@@ -4 +4 @@
     global $bp, $wpdb, $current_blog;
 
-    if ( is_user_logged_in() && bp_core_user_has_home() ) {
+    if ( is_user_logged_in() ) {
         echo '<div id="wp-admin-bar">';
         echo '<a href="' . get_blog_option( 1, 'siteurl' ) . '"><img id="admin-bar-logo" src="' . site_url() . '/wp-content/mu-plugins/bp-core/images/admin_bar_logo.gif" alt="BuddyPress" /></a>';
@@ -73 +73 @@
         
         if ( $current_blog->blog_id > 1 ) {
-            if ( bp_core_is_home_base( $current_blog->blog_id ) ) {
-                // TODO: possible menu for current group/user/photo etc
-            } else {
-                $authors = get_users_of_blog(); 
+            $authors = get_users_of_blog(); 
+        
+            if ( is_array( $authors ) ) {
+                /* This is a blog, render a menu with links to all authors */
+                echo '<li><a href="/">';
+                _e('Blog Authors', 'buddypress');
+                echo '</a>';
             
-                if ( is_array( $authors ) ) {
-                    /* This is a blog, render a menu with links to all authors */
-                    echo '<li><a href="/">';
-                    _e('Blog Authors', 'buddypress');
+                echo '<ul class="author-list">';
+                foreach( $authors as $author ) {
+                    $author = new BP_Core_User( $author->user_id );
+                    echo '<li>';
+
+                    echo '<div class="admin-bar-clear"><a href="' . $author->user_url . '">';
+                    echo $author->avatar_mini;
+                    echo ' ' . $author->fullname;
+                    echo '<span class="activity">' . $author->last_active . '</span>';
                     echo '</a>';
-                
-                    echo '<ul class="author-list">';
-                    foreach( $authors as $author ) {
-                        $author = new BP_Core_User( $author->user_id );
-                        echo '<li>';
-
-                        echo '<div class="admin-bar-clear"><a href="' . $author->user_url . '">';
-                        echo $author->avatar_mini;
-                        echo ' ' . $author->fullname;
-                        echo '<span class="activity">' . $author->last_active . '</span>';
-                        echo '</a>';
-                        echo '</div>';
-                        echo '</li>';
-                    }
-                    echo '</ul>';
+                    echo '</div>';
                     echo '</li>';
                 }
+                echo '</ul>';
+                echo '</li>';
             }
         }

trunk/bp-core/bp-core-ajax-handler.php

@@ -1 +1 @@
 <?php
 define('DOING_AJAX', true);
-require_once( $_SERVER['DOCUMENT_ROOT'] . '/wp-load.php' );
+require_once( dirname(dirname(dirname(dirname(__FILE__)))) . '/wp-load.php' );
 
 do_action( 'wp_ajax_' . $_POST['action'] );

trunk/bp-core/bp-core-ajax.php

@@ -29 +29 @@
     
         foreach ( (array) $users as $user ) {
-            if ( !bp_core_user_has_home($user->user_id) || !$user->user_id ) continue;
         ?>
             <li>
@@ -64 +63 @@
 add_action( 'wp_ajax_widget_members', 'bp_core_ajax_widget_members' );
 
+
+function bp_core_ajax_directory_members() {
+    global $bp;
+
+    check_ajax_referer('directory_members');
+
+    if ( !$bp ) {
+        bp_core_setup_globals();
+        
+        if ( function_exists('friends_install') )
+            friends_setup_globals();
+    }
+    
+    $users = BP_Core_User::get_users_by_letter( $_POST['letter'] );
+
+    if ( $users ) {
+        echo '0[[SPLIT]]'; // return valid result.
+    
+        foreach ( (array) $users as $user ) {
+        ?>
+            <li>
+                <div class="item-avatar">
+                    <?php echo bp_core_get_avatar( $user->user_id, 1 ) ?>
+                </div>
+
+                <div class="item">
+                    <div class="item-title"><?php echo bp_core_get_userlink( $user->user_id ) ?></div>
+                    <div class="item-meta">
+                        <span class="activity">
+                            <?php echo bp_core_get_last_activity( get_usermeta( $user->user_id, 'last_activity' ), __('active '), __(' ago') ); ?>
+                        </span>
+                    </div>
+                </div>
+            </li>
+            <?php   
+        }
+    } else {
+        echo "-1[[SPLIT]]<li>" . __("No members matched the current filter.");
+    }
+}
+add_action( 'wp_ajax_directory_members', 'bp_core_ajax_directory_members' );
+
+
 ?>

trunk/bp-core/bp-core-avatars.php

@@ -19 +19 @@
 
 function bp_core_get_avatar( $user, $version = 1, $no_tag = false, $width = null, $height = null ) {
+    global $bp, $current_blog;
+    
     if ( !is_int($version) )
         $version = (int) $version;
@@ -25 +27 @@
         $version = 1;
     
-    if ( $home_base_id = get_usermeta( $user, 'home_base' ) )
-        $url = get_blog_option($home_base_id, 'siteurl');
-        
     if ( !$width )
         $width = constant('CORE_AVATAR_V' . $version . '_W');
@@ -34 +33 @@
         $height = constant('CORE_AVATAR_V' . $version . '_H');      
     
-    $str = get_usermeta( $user, "bp_core_avatar_v$version" );
-    
-    if ( strlen($str) ) {
+
+    $avatar_file = get_usermeta( $user, "bp_core_avatar_v$version" );
+    $url = $bp['root_domain'] . '/' . $avatar_file;
+    
+    if ( strlen($avatar_file) ) {
         if ( $no_tag )
-            return $str;
+            return $url;
         else
-            return '<img src="' . $url . '/' . $str . '" alt="" class="avatar" width="' . $width . '" height="' . $height . '" />';
+            return '<img src="' . $url . '" alt="" class="avatar" width="' . $width . '" height="' . $height . '" />';
     } else {
+        $identicon = 'http://www.gravatar.com/avatar/' . md5( $user . '@buddypress.org') . '?d=wavatar&amp;s=';
         if ( $no_tag )
-            return CORE_DEFAULT_AVATAR_THUMB;
+            return $identicon . constant('CORE_AVATAR_V' . $version . '_W');
         else
-            return '<img src="' . CORE_DEFAULT_AVATAR . '" alt="" class="avatar" width="' . $width . '" height="' . $height . '" />';
+            return '<img src="' . $identicon . constant('CORE_AVATAR_V' . $version . '_W') . '" alt="" class="avatar" width="' . $width . '" height="' . $height . '" />';
     }
 }
@@ -72 +74 @@
 
 // Main UI Rendering
-function bp_core_avatar_admin( $message = null, $action = null, $delete_action = null ) {
+function bp_core_avatar_admin( $message = null ) {
     global $wp_upload_error;
     ?>  
@@ -90 +92 @@
         
         <?php
-        if ( !$action )
-            $action = site_url() . '/wp-admin/admin.php?page=bp-xprofile.php';
-        
-        if ( !$delete_action )
-            $delete_action = site_url() . '/wp-admin/admin.php?page=bp-xprofile.php&slick_avatars_action=delete';
-        
+
         bp_core_render_avatar_upload_form($action);
 
@@ -132 +129 @@
         
         if ( !bp_core_check_avatar_size($_FILES) )
-            bp_core_ap_die( 'The file you uploaded is too big. Please upload a file under ' . size_format(1024 * CORE_MAX_FILE_SIZE) );
+            bp_core_ap_die( 'The file you uploaded is too big. Please upload a file under ' . size_format(CORE_MAX_FILE_SIZE) );
 
         if ( !bp_core_check_avatar_type($_FILES) )
@@ -148 +145 @@
             $canvas = $original;
         
-        // Render the cropper UI
-        if ( !$action )
-            $action = get_option('home') .'/wp-admin/admin.php?page=bp-xprofile.php';
-        
+        // Render the cropper UI        
         bp_core_render_avatar_cropper($original, $canvas, $action);
         
@@ -258 +252 @@
         $user_id = $bp['loggedin_userid'];
 
-    if ( !$url ) {
-        $home_base_id = get_usermeta( $user_id, 'home_base' );
-        $url = get_blog_option($home_base_id, 'siteurl');
-    }
-
-    $src = str_replace( array(ABSPATH), array($url . '/'), $new );
+    $src = str_replace( array(ABSPATH), array(site_url() . '/'), $new );
 
     // Load cropper details
@@ -401 +390 @@
 }
 
-function bp_core_avatar_save( $vars, $user_id = false, $upload_dir = false, $url = false ) {
+function bp_core_avatar_save( $vars, $user_id = false ) {
     if ( !$user_id )
         $user_id = get_current_user_id();
-        
-    if ( !$url ) {
-        $home_base_id = get_usermeta( $user_id, 'home_base' );
-        $url = get_blog_option($home_base_id, 'siteurl');
-    }
     
     $old = get_usermeta( $user_id, 'bp_core_avatar_v1_path' );
@@ -458 +442 @@
 function bp_core_ap_die( $msg ) {
     echo '<p><strong>' . $msg . '</strong></p>';
-    echo '<p><a href="' . get_option('home') .'/wp-admin/admin.php?page=bp-xprofile.php">' . __('Try Again', 'buddypress') . '</a></p>';
+    echo '<p><a href="' . $bp['loggedin_domain'] . '/' . $bp['profile']['slug'] . '/change-avatar">' . __('Try Again', 'buddypress') . '</a></p>';
     echo '</div>';
     exit;

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

@@ -29 +29 @@
 function bp_core_set_uri_globals() {
     global $current_component, $current_action, $action_variables;
-
+    global $current_userid;
+    global $is_member_page;
+    
     /* Fetch the current URI and explode each part seperated by '/' into an array */
     $bp_uri = explode( "/", $_SERVER['REQUEST_URI'] );
+    
+    /* Take empties off the end of complete URI */
+    if ( $bp_uri[count($bp_uri) - 1] == "" )
+        array_pop( $bp_uri );
+
+    /* Take empties off the start of complete URI */
+    if ( $bp_uri[0] == "" )
+        array_shift( $bp_uri );
+        
+    /* Get total URI segment count */
+    $bp_uri_count = count( $bp_uri ) - 1;
+    $is_member_page = false;
     
     /* Set the indexes, these are incresed by one if we are not on a VHOST install */
@@ -40 +54 @@
     $paths = explode( '/', bp_core_get_site_path() );
 
-    /* Take empties off the end */
+    /* Take empties off the end of path */
     if ( $paths[count($paths) - 1] == "" )
         array_pop( $paths );
 
-    /* Take empties off the start */
+    /* Take empties off the start of path */
     if ( $paths[0] == "" )
         array_shift( $paths );
-    
-    /* Take empties off the end */
-    if ( $bp_uri[count($bp_uri) - 1] == "" )
-        array_pop( $bp_uri );
-
-    /* Take empties off the start */
-    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++ ) {
@@ -66 +69 @@
     
     /* Reset the keys by merging with an empty array */
-    $bp_uri = array_merge( array(), $bp_uri );
+    $bp_uri = array_merge( array(), $bp_uri );  
+    
+    if ( $bp_uri[0] == 'members' && $bp_uri[1] != '' ) {
+        $is_member_page = true;
+        $is_root_component = true;
+        
+        // We are within a member home base, set up user id globals
+        $current_userid = bp_core_get_current_userid( $bp_uri[1] );
+        
+        unset($bp_uri[0]);
+        unset($bp_uri[1]);
+        
+        /* 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 ( !isset($is_root_component) )
+        $is_root_component = in_array( $bp_uri[0], $root_components );
+
     if ( VHOST == 'no' && !$is_root_component ) {
         $component_index++;
@@ -82 +101 @@
     /* Set the current action */
     $current_action = $bp_uri[$action_index];
-
+    
     /* Set the entire URI as the action variables, we will unset the current_component and action in a second */
     $action_variables = $bp_uri;
@@ -96 +115 @@
     /* Reset the keys by merging with an empty array */
     $action_variables = array_merge( array(), $action_variables );
+    
+    //var_dump($current_component, $current_action, $action_variables);
 }
 add_action( 'wp', 'bp_core_set_uri_globals', 1 );
@@ -130 +151 @@
 
     $pages = $bp_path;
-    
+
     if ( !file_exists( TEMPLATEPATH . "/header.php" ) || !file_exists( TEMPLATEPATH . "/footer.php" ) )
         wp_die( 'Please make sure your BuddyPress enabled theme includes a header.php and footer.php file.');
@@ -158 +179 @@
     die;
 }
+
+
+/**
+ * bp_core_catch_profile_uri()
+ *
+ * If the extended profiles component is not installed we still need
+ * to catch the /profile URI's and display whatever we have installed.
+ * 
+ */
+function bp_core_catch_profile_uri() {
+    global $bp;
+    
+    if ( !function_exists('xprofile_install') )
+        bp_catch_uri( 'profile/index' );
+}
+
+function bp_core_force_buddypress_theme() {
+    global $current_component, $current_action;
+    global $is_member_page;
+    
+    // The theme filter does not recognize any globals, where as the stylesheet filter does.
+    // We have to set up the globals to use manually.
+    bp_core_set_uri_globals();
+    
+    if ( function_exists('groups_setup_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'] );
+    
+    if ( $is_member_page )
+        $theme = 'buddypress-member';
+    else if ( $current_component == $groups_bp['groups']['slug'] && $is_single_group )
+        $theme = 'buddypress-member';
+    else
+        $theme = get_option('template');
+    
+    return $theme;
+}
+add_filter( 'template', 'bp_core_force_buddypress_theme' );
+
+function bp_core_force_buddypress_stylesheet() {
+    global $bp, $is_single_group, $is_member_page;
+    
+    if ( $is_member_page )
+        return 'buddypress-member';
+    else if ( $bp['current_component'] == $bp['groups']['slug'] && $is_single_group )   
+        return 'buddypress-member';
+    else
+        return get_option('stylesheet');    
+}
+add_filter( 'stylesheet', 'bp_core_force_buddypress_stylesheet' );
+
+
+
 ?>

trunk/bp-core/bp-core-classes.php

@@ -61 +61 @@
         $this->fullname = bp_core_get_userlink( $this->id, true );
         $this->email = bp_core_get_user_email( $this->id );
-        $this->last_active = bp_core_get_last_activity( get_usermeta( $this->id, 'last_activity' ), __('active ', 'buddypress'), __(' ago', 'buddypress') );
+        $this->last_active = bp_core_get_last_activity( get_usermeta( $this->id, 'last_activity' ), __('active '), __(' ago') );
         
         if ( function_exists('xprofile_install') ) {
@@ -67 +67 @@
             $this->avatar_thumb = bp_core_get_avatar( $this->id, 1 );
             $this->avatar_mini = bp_core_get_avatar( $this->id, 1, false, 25, 25 );
-            
-            $this->profile_last_updated = bp_profile_last_updated_date( $this->id, false );
         }
         
@@ -117 +115 @@
         return $wpdb->get_results( $wpdb->prepare( "SELECT user_id FROM {$wpdb->base_prefix}usermeta um WHERE meta_key = 'last_activity' AND DATE_ADD( FROM_UNIXTIME(meta_value), INTERVAL 5 MINUTE ) >= NOW() ORDER BY FROM_UNIXTIME(meta_value) DESC LIMIT %d", $limit ) );       
     }
+    
+    function get_users_by_letter( $letter, $limit = 5 ) {
+        global $wpdb, $bp;
+        
+        if ( !function_exists('xprofile_install') )
+            return false;
+        
+        if ( !$bp ) {
+            bp_core_setup_globals();
+            xprofile_setup_globals();
+        }
+        
+        if ( !$limit )
+            $limit = 5;
+        
+        if ( strlen($letter) > 1 || is_numeric($letter) || !$letter )
+            return false;
+        
+        like_escape($letter);
+        
+        return $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT um.user_id FROM {$wpdb->base_prefix}usermeta um LEFT JOIN {$bp['profile']['table_name_data']} pd ON um.user_id = pd.user_id LEFT JOIN {$bp['profile']['table_name_fields']} pf ON pd.field_id = pf.id WHERE pf.name = 'First Name' AND pd.value LIKE '$letter%%' ORDER BY pf.name DESC" ) ); 
+    }
 }
 

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

@@ -25 +25 @@
  */
 function bp_core_add_ajax_js() {
-    echo '<script type="text/javascript">var ajaxurl = "' . site_url() . '/wp-content/mu-plugins/bp-core/bp-core-ajax-handler.php";</script>';
+    echo 
+'<script type="text/javascript">var ajaxurl = "' . site_url() . '/wp-content/mu-plugins/bp-core/bp-core-ajax-handler.php";</script>
+';
 }
 add_action( 'wp_head', 'bp_core_add_ajax_js' );
@@ -38 +40 @@
  */
 function bp_core_add_css() {
-    if ( is_user_logged_in() && bp_core_user_has_home() ) {
+    if ( is_user_logged_in() ) {
         wp_enqueue_style( 'bp-admin-bar', site_url() . '/wp-content/mu-plugins/bp-core/css/admin-bar.css' );
-        wp_print_styles();
     }
+    wp_print_styles();
 }
 add_action( 'wp_head', 'bp_core_add_css' );

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

@@ -182 +182 @@
     if ( !is_user_logged_in() || is_null($bp['loggedin_userid']) || is_null($bp['current_userid']) )
         return false;
-    
+        
     if ( $bp['loggedin_userid'] == $bp['current_userid'] )
         return true;
@@ -199 +199 @@
 }
 
+function bp_loggedinuser_avatar_thumbnail( $width = false, $height = false ) {
+    global $bp;
+    
+    if ( $width && $height )
+        echo bp_core_get_avatar( $bp['loggedin_userid'], 1, false, $width, $height );
+    else
+        echo bp_core_get_avatar( $bp['loggedin_userid'], 1 );
+}
+
+function bp_fetch_user_fullname( $user_id = false, $echo = true ) {
+    global $bp;
+    
+    if ( !$user_id )
+        $user_id = $bp['current_userid'];
+    
+    if ( function_exists('xprofile_install') ) {
+        $data = bp_get_field_data( array( 'First Name', 'Last Name' ), $user_id );
+        
+        if ( empty($data['First Name']) && empty($data['Last Name']) ) {
+            $ud = get_userdata($user_id);
+            $data = $ud->display_name;
+        } else {
+            $data = ucfirst($data['First Name']) . ' ' . ucfirst($data['Last Name']);
+        }
+    } else {
+        $ud = get_userdata($user_id);
+        $data = $ud->display_name;
+    }
+    
+    if ( $echo )
+        echo $data;
+    else
+        return $data;
+    
+}
+
+function bp_last_activity( $user_id = false, $echo = true ) {
+    global $bp;
+    
+    if ( !$user_id )
+        $user_id = $bp['current_userid'];
+    
+    $last_activity = bp_core_get_last_activity( get_usermeta( $user_id, 'last_activity' ), __('active ', 'buddypress'), __(' ago', 'buddypress') );
+
+    if ( $echo )
+        echo $last_activity;
+    else
+        return $last_activity;
+}
+
+function bp_the_avatar() {
+    global $bp;
+    echo bp_core_get_avatar( $bp['current_userid'], 2 );
+}
+
+function bp_the_avatar_thumbnail() {
+    global $bp;
+    echo bp_core_get_avatar( $bp['current_userid'], 1 );
+}
+
+function bp_user_link() {
+    echo '';
+}
+
+function bp_core_get_wp_profile() {
+    
+}
+
+function bp_get_profile_header() {
+    load_template( TEMPLATEPATH . '/profile/profile-header.php' );
+}
+
 function bp_exists( $component_name ) {
     if ( function_exists($component_name . '_install') )
@@ -312 +384 @@
 }
 
+function bp_get_plugin_sidebar() {
+    if ( file_exists(TEMPLATEPATH . '/plugin-sidebar.php') )
+        load_template( TEMPLATEPATH . '/plugin-sidebar.php' );
+}
+
 /* Template functions for fetching globals, without querying the DB again
    also means we dont have to use the $bp variable in the template (looks messy) */

trunk/bp-core/bp-core-widgets.php

@@ -107 +107 @@
         <ul id="members-list" class="item-list">
             <?php foreach ( (array) $users as $user ) : ?>
-                <?php if ( !bp_core_user_has_home($user->user_id) ) continue; ?>
                 <li>
                     <div class="item-avatar">
@@ -178 +177 @@
             <div class="avatar-block">
             <?php foreach ( (array) $users as $user ) : ?>
-                <?php if ( !bp_core_user_has_home($user->user_id) || !$user->user_id ) continue; ?>
                 <div class="item-avatar">
                     <a href="<?php echo bp_core_get_userurl($user->user_id) ?>" title="<?php bp_fetch_user_fullname( $user->user_id, true ) ?>"><?php echo bp_core_get_avatar( $user->user_id, 1 ) ?></a>

trunk/bp-friends.php

@@ -173 +173 @@
     if ( function_exists('bp_activity_record') ) {
         extract($args);
-        bp_activity_record( $item_id, $component_name, $component_action, $is_private, $dual_record, $secondary_user_homebase_id );
+        bp_activity_record( $item_id, $component_name, $component_action, $is_private, $dual_record );
     } 
 }
@@ -370 +370 @@
 function friends_accept_friendship( $friendship_id ) {
     $friendship = new BP_Friends_Friendship( $friendship_id, true, false );
-    $secondary_user_homebase_id = get_usermeta( $friendship->friend_user_id, 'home_base' );
     
     if ( BP_Friends_Friendship::accept( $friendship_id ) ) {
         friends_update_friend_totals( $friendship->initiator_user_id, $friendship->friend_user_id );
         
-        do_action( 'bp_friends_friendship_accepted', array( 'item_id' => $friendship_id, 'component_name' => 'friends', 'component_action' => 'friendship_accepted', 'is_private' => 0, 'dual_record' => true, 'secondary_user_homebase_id' => $secondary_user_homebase_id ) );
+        do_action( 'bp_friends_friendship_accepted', array( 'item_id' => $friendship_id, 'component_name' => 'friends', 'component_action' => 'friendship_accepted', 'is_private' => 0, 'dual_record' => true ) );
         return true;
     }

trunk/bp-groups.php

@@ -161 +161 @@
         /* Using "item" not "group" for generic support in other components. */
         $bp['is_item_admin'] = groups_is_user_admin( $bp['loggedin_userid'], $group_obj->id );
+        
+        /* Is the logged in user a member of the group? */
+        $is_member = ( BP_Groups_Member::check_is_member( $bp['loggedin_userid'], $group_obj->id ) ) ? true : false;
+    
+        /* Should this group be visible to the logged in user? */
+        $is_visible = ( $group_obj->status == 'public' || $is_member ) ? true : false;
     }
 
@@ -186 +192 @@
             $bp['bp_options_title'] = $bp['current_fullname'];
             
-        } else if ( $is_single_group ) {        
+        } else if ( $is_single_group ) {
             // We are viewing a single group, so set up the
             // group navigation menu using the $group_obj global.
@@ -208 +214 @@
             bp_core_add_nav_default( $bp['groups']['slug'], 'groups_screen_group_home', 'home' );
             
-            bp_core_add_subnav_item( $bp['groups']['slug'], 'home', __('Home', 'buddypress'), $group_link, 'groups_screen_group_home', 'group-home' );
-            bp_core_add_subnav_item( $bp['groups']['slug'], 'forum', __('Forum', 'buddypress'), $group_link , 'groups_screen_group_forum', 'group-forum');
+            bp_core_add_subnav_item( $bp['groups']['slug'], 'home', __('Home', 'buddypress'), $group_link, 'groups_screen_group_home', 'group-home', $is_visible );
+            bp_core_add_subnav_item( $bp['groups']['slug'], 'forum', __('Forum', 'buddypress'), $group_link , 'groups_screen_group_forum', 'group-forum', $is_visible);
             
             if ( function_exists('bp_wire_install') ) {
-                bp_core_add_subnav_item( $bp['groups']['slug'], 'wire', __('Wire', 'buddypress'), $group_link, 'groups_screen_group_wire', 'group-wire' );
+                bp_core_add_subnav_item( $bp['groups']['slug'], 'wire', __('Wire', 'buddypress'), $group_link, 'groups_screen_group_wire', 'group-wire', $is_visible );
             }
             
             if ( function_exists('bp_gallery_install') ) {
-                bp_core_add_subnav_item( $bp['groups']['slug'], 'photos', __('Photos', 'buddypress'), $group_link, 'groups_screen_group_photos', 'group-photos' );
+                bp_core_add_subnav_item( $bp['groups']['slug'], 'photos', __('Photos', 'buddypress'), $group_link, 'groups_screen_group_photos', 'group-photos', $is_visible );
             }
             
-            bp_core_add_subnav_item( $bp['groups']['slug'], 'members', __('Members', 'buddypress'), $group_link, 'groups_screen_group_members', 'group-members' );
+            bp_core_add_subnav_item( $bp['groups']['slug'], 'members', __('Members', 'buddypress'), $group_link, 'groups_screen_group_members', 'group-members', $is_visible );
             
             if ( is_user_logged_in() && groups_is_user_member( $bp['loggedin_userid'], $group_obj->id ) ) {
-                bp_core_add_subnav_item( $bp['groups']['slug'], 'send-invites', __('Send Invites', 'buddypress'), $group_link, 'groups_screen_group_invite', 'group-invite' );
-                bp_core_add_subnav_item( $bp['groups']['slug'], 'leave-group', __('Leave Group', 'buddypress'), $group_link, 'groups_screen_group_leave', 'group-leave' );
+                bp_core_add_subnav_item( $bp['groups']['slug'], 'send-invites', __('Send Invites', 'buddypress'), $group_link, 'groups_screen_group_invite', 'group-invite', $is_member );
+                bp_core_add_subnav_item( $bp['groups']['slug'], 'leave-group', __('Leave Group', 'buddypress'), $group_link, 'groups_screen_group_leave', 'group-leave', $is_member );
             }
         }
@@ -229 +235 @@
 }
 add_action( 'wp', 'groups_setup_nav', 2 );
-
-function groups_get_group_theme() {
-    global $current_component, $current_action, $is_single_group;
-        
-    // The theme filter does not recognize any globals, where as the stylesheet filter does.
-    // We have to set up the globals to use manually.
-    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'] );
-
-    if ( $current_component == $groups_bp['groups']['slug'] && $is_single_group )
-        $theme = 'buddypress';
-    else
-        $theme = get_option('template');
-    
-    return $theme;
-}
-add_filter( 'template', 'groups_get_group_theme' );
-
-function groups_get_group_stylesheet() {
-    global $bp, $is_single_group;
-    
-    if ( $bp['current_component'] == $bp['groups']['slug'] && $is_single_group )    
-        return 'buddypress';
-    else
-        return get_option('stylesheet');    
-}
-add_filter( 'stylesheet', 'groups_get_group_stylesheet' );
 
 
@@ -633 +609 @@
         $avatar_error = true;
         $avatar_size = size_format(1024 * CORE_MAX_FILE_SIZE);
-        $avatar_error_msg = __('The file you uploaded is too big. Please upload a file under', 'buddypress') . size_format(1024 * CORE_MAX_FILE_SIZE);
+        $avatar_error_msg = __('The file you uploaded is too big. Please upload a file under', 'buddypress') . size_format(CORE_MAX_FILE_SIZE);
     }
     

trunk/bp-groups/bp-groups-classes.php

@@ -59 +59 @@
             $this->total_member_count = groups_get_groupmeta( $this->id, 'total_member_count' );
             
-            if ( !$group->avatar_thumb )
-                $this->avatar_thumb = $bp['groups']['image_base'] . '/none-thumbnail.gif';
+            if ( !$group->avatar_thumb || strpos( $group->avatar_thumb, 'none-thumbnail' ) )
+                $this->avatar_thumb = 'http://www.gravatar.com/avatar/' . md5( $this->id . '@buddypress.org') . '?d=identicon&s=50';
             else
                 $this->avatar_thumb = $group->avatar_thumb;
             
-            if ( !$group->avatar_full )
-                $this->avatar_full = $bp['groups']['image_base'] . '/none.gif';
+            if ( !$group->avatar_full || strpos( $group->avatar_thumb, 'none-' ) )
+                $this->avatar_full = 'http://www.gravatar.com/avatar/' . md5( $this->id . '@buddypress.org') . '?d=identicon&s=150';
             else
                 $this->avatar_full = $group->avatar_full;
@@ -417 +417 @@
         
     /* Static Functions */
-    
-    function get_group_ids( $user_id, $page = false, $limit = false ) {
-        global $wpdb, $bp;
-        
-        if ( $limit && $page )
-            $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
-
-        $group_ids = $wpdb->get_col( $wpdb->prepare( "SELECT DISTINCT group_id FROM " . $bp['groups']['table_name_members'] . " WHERE user_id = %d AND is_confirmed = 1$pag_sql", $user_id ) );
-        $group_count = BP_Groups_Member::total_group_count( $user_id );
-    
-        return array( 'ids' => $group_ids, 'count' => $group_count );
-    }
-    
-    function total_group_count( $user_id = false ) {
-        global $bp, $wpdb;
-        
-        if ( !$user_id )
-            $user_id = $bp['current_userid'];
-            
-        return $wpdb->get_var( $wpdb->prepare( "SELECT DISTINCT count(group_id) FROM " . $bp['groups']['table_name_members'] . " WHERE user_id = %d AND is_confirmed = 1", $user_id ) );
-    }
-    
-    function get_invites( $user_id ) {
-        global $wpdb, $bp;
-        
-        $group_ids = $wpdb->get_col( $wpdb->prepare( "SELECT group_id FROM " . $bp['groups']['table_name_members'] . " WHERE user_id = %d and is_confirmed = 0", $user_id ) );
-        
-        for ( $i = 0; $i < count($group_ids); $i++ ) {
-            $groups[] = new BP_Groups_Group($group_ids[$i]);
-        }
-        
-        return $groups;
-    }
-    
+
     function delete( $user_id, $group_id ) {
         global $wpdb, $bp;
@@ -464 +431 @@
     }
     
+    function get_group_ids( $user_id, $page = false, $limit = false ) {
+        global $wpdb, $bp;
+        
+        if ( $limit && $page )
+            $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
+
+        $group_ids = $wpdb->get_col( $wpdb->prepare( "SELECT DISTINCT group_id FROM " . $bp['groups']['table_name_members'] . " WHERE user_id = %d AND is_confirmed = 1$pag_sql", $user_id ) );
+        $group_count = BP_Groups_Member::total_group_count( $user_id );
+    
+        return array( 'ids' => $group_ids, 'count' => $group_count );
+    }
+    
+    function total_group_count( $user_id = false ) {
+        global $bp, $wpdb;
+        
+        if ( !$user_id )
+            $user_id = $bp['current_userid'];
+            
+        return $wpdb->get_var( $wpdb->prepare( "SELECT DISTINCT count(group_id) FROM " . $bp['groups']['table_name_members'] . " WHERE user_id = %d AND is_confirmed = 1", $user_id ) );
+    }
+    
+    function get_invites( $user_id ) {
+        global $wpdb, $bp;
+        
+        $group_ids = $wpdb->get_col( $wpdb->prepare( "SELECT group_id FROM " . $bp['groups']['table_name_members'] . " WHERE user_id = %d and is_confirmed = 0", $user_id ) );
+        
+        for ( $i = 0; $i < count($group_ids); $i++ ) {
+            $groups[] = new BP_Groups_Group($group_ids[$i]);
+        }
+        
+        return $groups;
+    }
+    
     function check_is_admin( $user_id, $group_id ) {
         global $wpdb, $bp;

trunk/bp-xprofile.php

@@ -6 +6 @@
 define ( 'BP_XPROFILE_VERSION', '0.3.10' );
 
+require_once( 'bp-xprofile/admin-mods/bp-xprofile-admin-mods.php' );
 require_once( 'bp-xprofile/bp-xprofile-classes.php' );
 require_once( 'bp-xprofile/bp-xprofile-admin.php' );
@@ -11 +12 @@
 require_once( 'bp-xprofile/bp-xprofile-templatetags.php' );
 require_once( 'bp-xprofile/bp-xprofile-cssjs.php' );
+
 
 /**************************************************************************
@@ -108 +110 @@
 function xprofile_setup_globals() {
     global $bp, $wpdb;
+    
+    /* Need to start a session for signup metadata purposes */
+    session_start();
     
     $bp['profile'] = array(
@@ -423 +428 @@
 
 /**************************************************************************
- xprofile_add_settings()
- 
- Renders the profile tab under settings for each member.
- **************************************************************************/
-
-function xprofile_add_settings() {
+ xprofile_remove_data_on_blog_deletion()
+ 
+ Removes all profile data from the DB if the admin deletes a Home Base.
+ **************************************************************************/
+
+function xprofile_remove_data_on_user_deletion( $user_id ) {
+    BP_XProfile_ProfileData::delete_data_for_user( $user_id );
+    
+    // delete any avatar files.
+    @unlink( get_usermeta( $user_id, 'bp_core_avatar_v1_path' ) );
+    @unlink( get_usermeta( $user_id, 'bp_core_avatar_v2_path' ) );
+    
+    // unset the usermeta for avatars from the usermeta table.
+    delete_usermeta( $user_id, 'bp_core_avatar_v1' );
+    delete_usermeta( $user_id, 'bp_core_avatar_v1_path' );
+    delete_usermeta( $user_id, 'bp_core_avatar_v2' );
+    delete_usermeta( $user_id, 'bp_core_avatar_v2_path' );
+}
+add_action( 'delete_user', 'xprofile_remove_data_on_user_deletion', 1 );
+
 ?>
-    <div class="wrap">
-        <h2><?php _e('Profile Settings', 'buddypress'); ?></h2>
-        <p>Member profile settings will appear here.</p>
-    </div>
-<?php
-}
-
-/**************************************************************************
- xprofile_remove_data_on_blog_deletion()
- 
- Removes all profile data from the DB if the admin deletes a Home Base.
- **************************************************************************/
-
-function xprofile_remove_data_on_blog_deletion( $blog_id ) {
-    global $wpdb, $bp;
-
-    /* Only delete profile data if we are removing a home base */
-    if ( $user_id = bp_core_get_homebase_userid( $blog_id ) ) {
-        BP_XProfile_ProfileData::delete_data_for_user( $user_id );
-        
-        // delete any avatar files.
-        @unlink( get_usermeta( $user_id, 'bp_core_avatar_v1_path' ) );
-        @unlink( get_usermeta( $user_id, 'bp_core_avatar_v2_path' ) );
-        
-        // unset the usermeta for avatars from the usermeta table.
-        delete_usermeta( $user_id, 'bp_core_avatar_v1' );
-        delete_usermeta( $user_id, 'bp_core_avatar_v1_path' );
-        delete_usermeta( $user_id, 'bp_core_avatar_v2' );
-        delete_usermeta( $user_id, 'bp_core_avatar_v2_path' );
-    }
-}
-add_action( 'delete_blog', 'xprofile_remove_data_on_blog_deletion', 1 );
-
-?>

trunk/bp-xprofile/bp-xprofile-signup.php

@@ -80 +80 @@
  **************************************************************************/
 
-function xprofile_validate_signup_fields() {
+function xprofile_validate_signup_fields( $result ) {
     global $bp_xprofile_callback, $avatar_error, $avatar_error_msg, $has_errors;
     global $canvas, $original;
-
+    global $current_site, $active_signup;
+    
     if ( isset( $_POST['validate_custom'] ) ) {
         // form has been submitted, let's validate the form
         // using the built in Wordpress functions and our own.
 
-        $active_signup = 'all';
-        $active_signup = apply_filters( 'wpmu_active_signup', $active_signup ); // return "all", "none", "blog" or "user"
-
-        $newblogname = isset( $_GET['new'] ) ? strtolower(preg_replace('/^-|-$|[^-a-zA-Z0-9]/', '', $_GET['new'])) : null;
-        if ( $_POST['blog_public'] != 1 )
-            $_POST['blog_public'] = 0;
-
-        if ( $active_signup == "none" ) {
-            _e( "Registration has been disabled." , 'buddypress');
+        extract($result);
+        
+        $counter = 0;
+        $has_errors = false;
+        $prev_field_id = -1;
+        
+        // Validate all sign up fields
+        $fields = BP_XProfile_Field::get_signup_fields();
+        foreach ( $fields as $field ) {
+            
+            $value = $_POST['field_' . $field->id];
+            
+            // Need to check if the previous field had
+            // the same ID, as to not validate individual
+            // day/month/year dropdowns individually.
+            if ( $prev_field_id != $field->id ) {
+                $field = new BP_XProfile_Field($field->id);
+                
+                    if ( $field->type == "datebox" ) {
+                        if ( $_POST['field_' . $field->id . '_day'] != "" && $_POST['field_' . $field->id . '_month'] != "" && $_POST['field_' . $field->id . '_year'] != "") {
+                            $value = strtotime( $_POST['field_' . $field->id . '_day'] . " " . 
+                                                $_POST['field_' . $field->id . '_month'] . " " .
+                                                $_POST['field_' . $field->id . '_year']);                               
+                        }
+                }
+                
+                if ( is_array($value) ) {
+                    $value = serialize( $value );
+                }
+                
+                $bp_xprofile_callback[$counter] = array(
+                    "field_id" => $field->id,
+                    "type" => $field->type,
+                    "value" => $value
+                );
+                
+                if ( $field->is_required && $value == '' ) {
+                    $bp_xprofile_callback[$counter]["error_msg"] = $field->name . ' cannot be left blank.';
+                    $has_errors = true;
+                }
+                
+                $counter++;
+            }
+            
+            $prev_field_id = $field->id;
+        }
+
+        // validate the avatar upload if there is one.
+        $avatar_error = false;
+        
+        if ( bp_core_check_avatar_upload($_FILES) ) {
+            if ( !bp_core_check_avatar_upload($_FILES) ) {
+                $avatar_error = true;
+                $avatar_error_msg = __('Your avatar upload failed, please try again.', 'buddypress');
+            }
+
+            if ( !bp_core_check_avatar_size($_FILES) ) {
+                $avatar_error = true;
+                $avatar_size = size_format(CORE_MAX_FILE_SIZE);
+                $avatar_error_msg = sprintf( __('The file you uploaded is too big. Please upload a file under %s', 'buddypress'), $avatar_size);
+            }
+
+            if ( !bp_core_check_avatar_type($_FILES) ) {
+                $avatar_error = true;
+                $avatar_error_msg = __('Please upload only JPG, GIF or PNG photos.', 'buddypress');     
+            }
+
+            // "Handle" upload into temporary location
+            if ( !$original = bp_core_handle_avatar_upload($_FILES) ) {
+                $avatar_error = true;
+                $avatar_error_msg = __('Upload Failed! Your photo dimensions are likely too big.', 'buddypress');                       
+            }
+
+            if ( !bp_core_check_avatar_dimensions($original) ) {
+                $avatar_error = true;
+                $avatar_error_msg = sprintf( __('The image you upload must have dimensions of %d x %d pixels or larger.', 'buddypress'), CORE_AVATAR_V2_W, CORE_AVATAR_V2_W );
+            }
+            
+            if ( !$canvas = bp_core_resize_avatar($original) )
+                $canvas = $original;
+        }
+        
+        if ( !$has_errors && !$avatar_error ) {
+            $public = (int) $_POST['blog_public'];
+            
+            // put the user profile meta in a session ready to store.
+            for ( $i = 0; $i < count($bp_xprofile_callback); $i++ ) {
+                $meta['field_' . $bp_xprofile_callback[$i]['field_id']] .= $bp_xprofile_callback[$i]['value'];
+            }
+
+            $meta['xprofile_field_ids'] = $_POST['xprofile_ids'];
+            $meta['avatar_image_resized'] = $canvas;
+            $meta['avatar_image_original'] = $original;
+            $meta['public'] = $public;
+            $meta['lang_id'] = 1;
+            
+            $_SESSION['xprofile_meta'] = $meta;
         } else {
-            if ( $active_signup == 'all' || $active_signup == "blog" ) {
-                $_POST['blog_id'] = $_POST['user_name'];
-                $_POST['blog_title'] = $_POST['field_1'] . " " . $_POST['field_2']; // The core name fields.
-
-                $counter = 0;
-                $has_errors = false;
-                $prev_field_id = -1;
-                
-                // Validate all sign up fields
-                $fields = BP_XProfile_Field::get_signup_fields();
-                foreach ( $fields as $field ) {
-                    
-                    $value = $_POST['field_' . $field->id];
-                    
-                    // Need to check if the previous field had
-                    // the same ID, as to not validate individual
-                    // day/month/year dropdowns individually.
-                    if ( $prev_field_id != $field->id ) {
-                        $field = new BP_XProfile_Field($field->id);
-                        
-                        if ( $field->type == "datebox" ) {
-                            if ( $_POST['field_' . $field->id . '_day'] != "" && $_POST['field_' . $field->id . '_month'] != "" && $_POST['field_' . $field->id . '_year'] != "") {
-                                $value = strtotime( $_POST['field_' . $field->id . '_day'] . " " . 
-                                                    $_POST['field_' . $field->id . '_month'] . " " .
-                                                    $_POST['field_' . $field->id . '_year']);                               
-                            }
-                        }
-                        
-                        if ( is_array($value) ) {
-                            $value = serialize( $value );
-                        }
-                        
-                        $bp_xprofile_callback[$counter] = array(
-                            "field_id" => $field->id,
-                            "type" => $field->type,
-                            "value" => $value
-                        );
-                        
-                        if ( $field->is_required && $value == '' ) {
-                            $bp_xprofile_callback[$counter]["error_msg"] = $field->name . ' cannot be left blank.';
-                            $has_errors = true;
-                        }
-                        
-                        $counter++;
-                    }
-                    
-                    $prev_field_id = $field->id;
-                }
-
-                // validate the avatar upload if there is one.
-                $avatar_error = false;
-                
-                if ( bp_core_check_avatar_upload($_FILES) ) {
-                    if ( !bp_core_check_avatar_upload($_FILES) ) {
-                        $avatar_error = true;
-                        $avatar_error_msg = __('Your avatar upload failed, please try again.', 'buddypress');
-                    }
-
-                    if ( !bp_core_check_avatar_size($_FILES) ) {
-                        $avatar_error = true;
-                        $avatar_size = size_format(1024 * CORE_MAX_FILE_SIZE);
-                        $avatar_error_msg = sprintf( __('The file you uploaded is too big. Please upload a file under %d', 'buddypress'), $avatar_size);
-                    }
-
-                    if ( !bp_core_check_avatar_type($_FILES) ) {
-                        $avatar_error = true;
-                        $avatar_error_msg = __('Please upload only JPG, GIF or PNG photos.', 'buddypress');     
-                    }
-
-                    // "Handle" upload into temporary location
-                    if ( !$original = bp_core_handle_avatar_upload($_FILES) ) {
-                        $avatar_error = true;
-                        $avatar_error_msg = __('Upload Failed! Your photo dimensions are likely too big.', 'buddypress');                       
-                    }
-
-                    if ( !bp_core_check_avatar_dimensions($original) ) {
-                        $avatar_error = true;
-                        $avatar_error_msg = sprintf( __('The image you upload must have dimensions of %d x %d pixels or larger.', 'buddypress'), CORE_AVATAR_V2_W, CORE_AVATAR_V2_W );
-                    }
-                    
-                    if ( !$canvas = bp_core_resize_avatar($original) )
-                        $canvas = $original;
-                }
-                
-                if ( !is_user_logged_in() ) {
-                    $result = wpmu_validate_user_signup( $_POST['user_name'], $_POST['user_email'] );
-                    extract($result);
-                
-                    if ( $errors->get_error_code() || $has_errors || $avatar_error ) {
-                        signup_user($user_name, $user_email, $errors);
-                    
-                        echo '</div>';
-                        get_footer();
-                        die;
-                    }
-                }
-                
-                if ( !$has_errors ) {
-                    if ( !is_user_logged_in() ) {
-                        // This is a new user signing up, not an existing user creating a home base.
-                        $result = wpmu_validate_blog_signup( $_POST['blog_id'], $_POST['blog_title'] );
-                        extract($result);
-
-                        if ( $errors->get_error_code() ) {
-                            signup_user( $user_name, $user_email, $errors );
-                            return;
-                        }
-                        
-                        $public = (int) $_POST['blog_public'];
-                        $meta = array( 'lang_id' => 1, 'public' => $public );
-
-                        for ( $i = 0; $i < count($bp_xprofile_callback); $i++ ) {
-                            $meta['field_' . $bp_xprofile_callback[$i]['field_id']] .= $bp_xprofile_callback[$i]['value'];
-                        }
-
-                        $meta['xprofile_field_ids'] = $_POST['xprofile_ids'];
-                        $meta['avatar_image_resized'] = $canvas;
-                        $meta['avatar_image_original'] = $original;
-
-                        $meta = apply_filters( "add_signup_meta", $meta );
-
-                        wpmu_signup_blog( $domain, $path, $blog_title, $user_name, $user_email, $meta );
-                        confirm_blog_signup( $domain, $path, $blog_title, $user_name, $user_email, $meta );
-
-                        echo '</div></div>';
-                        get_footer();
-                        die;
-                    } else {
-                        bp_core_validate_homebase_form_secondary();
-                    }
-                } else {
-                    if ( !is_user_logged_in() ) {
-                        signup_user( $user_name, $user_email, $errors );
-                    
-                        echo '</div>';
-                        get_footer();
-                        die;
-                    } else {
-                        bp_core_validate_homebase_form_secondary( $user_name, $user_email, $errors );
-                    }
-                }
-
-            } else {
-                _e( "Registration has been disabled." , 'buddypress');
-            }
-        }
-    }   
-}
-
-add_action( 'preprocess_signup_form', 'xprofile_validate_signup_fields' );
-
+            $errors->add( 'bp_xprofile_errors', '' );
+        }
+    }
+    
+    return array('user_name' => $user_name, 'user_email' => $user_email, 'errors' => $errors);
+}
+add_filter( 'wpmu_validate_user_signup', 'xprofile_validate_signup_fields', 10, 1 );
+
+
+function xprofile_add_profile_meta( $meta ) {
+    return $_SESSION['xprofile_meta'];
+}
+add_filter( 'add_signup_meta', 'xprofile_add_profile_meta' );
 
 /**************************************************************************
@@ -258 +209 @@
 
 function xprofile_hidden_signup_fields() {
-    global $active_signup;
-    
-    // Override the stage variable so we can redirect the validation of the form
-    // to our own custom validation function.
-    
-    if( !is_user_logged_in() ) {
-    ?>
-    <input type="hidden" name="stage" value="" />
-    <?php } ?>
-    <input type="hidden" name="validate_custom" value="1" />
-    <?php
-    
-    if ( $active_signup != 'none' )
-        $active_signup = 'blog';
+    ?><input type="hidden" name="validate_custom" value="1" /><?php
 }
 add_action( 'signup_hidden_fields', 'xprofile_hidden_signup_fields' );
@@ -277 +215 @@
 
 /**************************************************************************
- xprofile_on_activate()
+ xprofile_on_activate_user()
  
  When a user activates their account, move the extra field data to the 
- correct tables, and then remove the WP options table entries.
+ correct tables.
  **************************************************************************/
 
-function xprofile_on_activate( $blog_id = null, $user_id = null ) {
-    global $wpdb, $profile_picture_path;
-    
-    if ( WP_INSTALLING )
-        return false;
-    
-    /* Only do this if this is a new user, and not a user creating a home base */
-    if ( !is_user_logged_in() ) {
-
-        // Extract signup meta fields to fill out profile
-        $field_ids = get_blog_option( $blog_id, 'xprofile_field_ids' );
-        $field_ids = explode( ",", $field_ids );
-            
-        // Get the new user ID.
-        $sql = "SELECT u.ID from " . $wpdb->base_prefix . "users u, 
-                " . $wpdb->base_prefix . "usermeta um
-                WHERE u.ID = um.user_id
-                AND um.meta_key = 'primary_blog'
-                AND um.meta_value = " . $blog_id;
-
-        $user_id = $wpdb->get_var($sql); 
-
-        // Loop through each bit of profile data and save it to profile.
-        for ( $i = 0; $i < count($field_ids); $i++ ) {
-            $field_value = get_blog_option( $blog_id, 'field_' . $field_ids[$i] );
-        
-            $field               = new BP_XProfile_ProfileData();
-            $field->user_id      = $user_id;
-            $field->value        = $field_value;
-            $field->field_id     = $field_ids[$i];
-            $field->last_updated = time();  
-
-            $field->save();
-            delete_blog_option( $blog_id, 'field_' . $field_ids[$i] );
-        }
-        delete_blog_option( $blog_id, 'xprofile_field_ids' );
-        
-        /* Make this blog the "home base" for the new user */
-        update_usermeta( $user_id, 'home_base', $blog_id );
-        update_usermeta( $user_id, 'last_activity', time() );
-        
-        /* Set the BuddyPress theme as the theme for this blog */
-        $wpdb->set_blog_id($blog_id);       
-        switch_theme( 'buddypress', 'buddypress' );
-        
-        // move and set the avatar if one has been provided.
-        $resized = get_blog_option( $blog_id, 'avatar_image_resized' );
-        $original = get_blog_option( $blog_id, 'avatar_image_original' );   
-    
-        if ( $resized && $original ) {
-            $upload_dir = bp_upload_dir(NULL, $blog_id);
-
-            if ( $upload_dir ) {
-                $resized_strip_path = explode( '/', $resized );
-                $original_strip_path = explode( '/', $original );
-
-                $resized_filename = $resized_strip_path[count($resized_strip_path) - 1];
-                $original_filename = $original_strip_path[count($original_strip_path) - 1];
-
-                $resized_new = $upload_dir['path'] . '/' . $resized_filename;
-                $original_new = $upload_dir['path'] . '/' . $original_filename;
-
-                @copy( $resized, $resized_new );
-                @copy( $original, $original_new );
-
-                @unlink($resized);
-                @unlink($original);
-
-                $resized = $resized_new;
-                $original = $original_new;
-            }
-        
-            // Render the cropper UI
-            $action = get_blog_option( $blog_id, 'siteurl' ) . '/wp-activate.php?key=' . $_GET['key'] . '&amp;cropped=true';
-            bp_core_render_avatar_cropper($original, $resized, $action, $user_id);
-        }
-    }
-    
-}
-add_action( 'wpmu_new_blog', 'xprofile_on_activate' );
-
+function xprofile_on_activate_blog( $blog_id, $user_id, $password, $title, $meta ) {
+    xprofile_extract_signup_meta( $user_id, $meta );
+    
+    // move and set the avatar if one has been provided.
+    xprofile_handle_signup_avatar( $user_id, $meta );
+}
+add_action( 'wpmu_activate_blog', 'xprofile_on_activate_blog', 1, 5 );
+
+
+function xprofile_on_activate_user( $user_id, $password, $meta ) {
+    xprofile_extract_signup_meta( $user_id, $meta );
+
+    // move and set the avatar if one has been provided.
+    xprofile_handle_signup_avatar( $user_id, $meta );
+}
+add_action( 'wpmu_activate_user', 'xprofile_on_activate_user', 1, 3 );
+
+
+function xprofile_extract_signup_meta( $user_id, $meta ) {
+    // Extract signup meta fields to fill out profile
+    $field_ids = $meta['xprofile_field_ids'];
+    $field_ids = explode( ',', $field_ids );
+
+    // Loop through each bit of profile data and save it to profile.
+    for ( $i = 0; $i < count($field_ids); $i++ ) {
+        if ( $field_ids[$i] == '' ) continue;
+        
+        $field_value = $meta["field_{$field_ids[$i]}"];
+        
+        $field               = new BP_XProfile_ProfileData();
+        $field->user_id      = $user_id;
+        $field->value        = $field_value;
+        $field->field_id     = $field_ids[$i];
+        $field->last_updated = time();  
+
+        $field->save();
+    }
+
+    update_usermeta( $user_id, 'last_activity', time() );
+}
+
+function xprofile_handle_signup_avatar( $user_id, $meta ) {
+    $resized = $meta['avatar_image_resized'];
+    $original = $meta['avatar_image_original']; 
+    
+    if ( !empty($resized) && !empty($original) ) {
+        $upload_dir = bp_avatar_upload_dir( $user_id );
+        
+        if ( $upload_dir ) {
+            $resized_strip_path = explode( '/', $resized );
+            $original_strip_path = explode( '/', $original );
+
+            $resized_filename = $resized_strip_path[count($resized_strip_path) - 1];
+            $original_filename = $original_strip_path[count($original_strip_path) - 1];
+
+            $resized_new = $upload_dir['path'] . '/' . $resized_filename;
+            $original_new = $upload_dir['path'] . '/' . $original_filename;
+
+            @copy( $resized, $resized_new );
+            @copy( $original, $original_new );
+
+            @unlink($resized);
+            @unlink($original);
+
+            $resized = $resized_new;
+            $original = $original_new;
+        }
+    
+        // Render the cropper UI
+        $action = site_url() . '/wp-activate.php?key=' . $_GET['key'] . '&amp;cropped=true';
+        bp_core_render_avatar_cropper($original, $resized, $action, $user_id);
+    }
+}
 
 function xprofile_catch_activate_crop() {
@@ -381 +311 @@
         }
         
-        $blog_id = get_usermeta( $user_id, 'home_base' );
-        $url = get_blog_option( $blog_id, 'siteurl' );
+        $ud = get_userdata($user_id);
+        $url = site_url() . '/members/' . $ud->user_login;
         
         wp_redirect( $url );
@@ -404 +334 @@
 
 
-// function xprofile_replace_blog_references() {
-//  if ( strpos( $_SERVER['SCRIPT_NAME'], 'wp-signup.php' ) ) {
-//      add_action( 'wp_head', 'xprofile_start_blog_reference_replacement' );
-//  }   
-// }
-// add_action( 'wp', 'xprofile_replace_blog_references' );
-
-// function xprofile_start_blog_reference_replacement( $contents ) {    
-//  ob_start();
-//  add_action('wp_footer', 'xprofile_end_blog_reference_replacement');
-// }
-// 
-// function xprofile_blog_reference_replacement( $contents ) {
-//  echo str_replace( 'blog', 'account', $contents );
-// }
-// 
-// function xprofile_end_blog_reference_replacement() {
-//  $contents = ob_get_contents();
-//  ob_end_clean();
-//  xprofile_blog_reference_replacement($contents);
-// }
-
-
-
 ?>

trunk/bp-xprofile/bp-xprofile-templatetags.php

@@ -133 +133 @@
 
 // Begin template tags:
+function xprofile_get_profile() {
+    load_template( TEMPLATEPATH . '/profile/profile-loop.php');
+}
 
 function bp_has_profile() { 
     global $bp, $profile_template;
-    
+
     $profile_template = new BP_XProfile_Template($bp['current_userid']);
     
@@ -222 +225 @@
 }
 
-function bp_the_avatar() {
-    global $bp;
-    echo bp_core_get_avatar( $bp['current_userid'], 2 );
-}
-
-function bp_the_avatar_thumbnail() {
-    global $bp;
-    echo bp_core_get_avatar( $bp['current_userid'], 1 );
-}
-
-function bp_loggedinuser_avatar_thumbnail( $width = false, $height = false ) {
-    global $bp;
-    
-    if ( $width && $height )
-        echo bp_core_get_avatar( $bp['loggedin_userid'], 1, false, $width, $height );
-    else
-        echo bp_core_get_avatar( $bp['loggedin_userid'], 1 );
-}
-
-function bp_fetch_user_fullname( $user_id = false, $echo = true ) {
-    global $bp;
-    
-    if ( !$user_id )
-        $user_id = $bp['current_userid'];
-    
-    $data = bp_get_field_data( array( 'First Name', 'Last Name' ), $user_id );
-    
-    if ( $echo )
-        echo ucfirst($data['First Name']) . ' ' . ucfirst($data['Last Name']);
-    else
-        return ucfirst($data['First Name']) . ' ' . ucfirst($data['Last Name']);        
-}
-
 function bp_get_field_data( $field, $user_id = null ) {
     return BP_XProfile_ProfileData::get_value_byfieldname( $field, $user_id );
-}
-
-function bp_user_link() {
-    echo '';
-}
-
-function bp_user_status() {
-    // TODO: dummy function now, until status component is developed.
-    return false;
 }
 
@@ -321 +282 @@
 }
 
-function bp_profile_last_updated_date( $user_id = false, $echo = true ) {
-    global $bp;
-    
-    if ( !$user_id )
-        $user_id = $bp['current_userid'];
-    
-    $last_updated = BP_XProfile_ProfileData::get_last_updated( $user_id );
-
-    if ( $echo )
-        echo $last_updated;
-    else
-        return $last_updated;
-}
-
 function bp_profile_last_updated() {
     global $bp;