Changeset 167

Timestamp:

06/19/08 17:10:30 (5 months ago)

Author:

apeatling

Message:

Fixed issues with subdirectory WPMU installations and BuddyPress

Location:

trunk

Files:

• bp-core.php (modified) (2 diffs)
• bp-core/bp-core-templatetags.php (modified) (1 diff)
• bp-xprofile.php (modified) (5 diffs)
• bp-xprofile/bp-xprofile-avatars.php (modified) (6 diffs)
• bp-xprofile/bp-xprofile-classes.php (modified) (3 diffs)
• bp-xprofile/bp-xprofile-signup.php (modified) (5 diffs)
• bp-xprofile/bp-xprofile-templatetags.php (modified) (5 diffs)

trunk/bp-core.php

@@ -15 +15 @@
 }
 
-function bpcore_setup() {
-        global $current_user, $source_domain, $bp_nav;
-        
-        $source_domain = 'http://' . get_usermeta( $current_user->ID, 'source_domain' ) . '/';
+function bp_core_setup() {
+        global $current_user, $loggedin_domain, $loggedin_userid;
+        global $current_domain, $current_userid, $bp_nav;
+        
+        $loggedin_domain = bp_core_get_loggedin_domain();
+        $loggedin_userid = $current_user->ID;
+        
+        $current_domain = bp_core_get_current_domain();
+        $current_userid = bp_core_get_current_userid();
         
         $bp_nav[1] = array(
                 'id'    => 'blog',
                 'name'  => 'Blog', 
-                'link'  => $source_domain . 'blog'
+                'link'  => $loggedin_domain . 'blog'
         );
 }
-add_action( 'wp', 'bpcore_setup' );
+add_action( 'wp', 'bp_core_setup' );
+
+function bp_core_get_loggedin_domain() {
+        global $current_user;
+        
+        if ( VHOST == 'yes' ) {
+                $loggedin_domain = 'http://' . get_usermeta( $current_user->ID, 'source_domain' ) . '/';
+        } else {
+                $loggedin_domain = 'http://' . get_usermeta( $current_user->ID, 'source_domain' ) . '/' . get_usermeta( $current_user->ID, 'user_login' ) . '/';
+        }
+
+        return $loggedin_domain;
+}
+
+function bp_core_get_current_domain() {
+        global $current_blog;
+        
+        if ( VHOST == 'yes' ) {
+                $current_domain = 'http://' . $current_blog->domain . '/';
+        } else {
+                $current_domain = get_bloginfo('wpurl') . '/';
+        }
+        
+        return $current_domain;
+}
+
+function bp_core_get_current_userid() {
+        $siteuser = bp_core_get_primary_username();
+        $current_userid = bp_core_get_userid($siteuser);
+        
+        return $current_userid;
+}
+
+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;
+}
 
 function start_buffer() {
@@ -353 +402 @@
 }
 
-
-// get the IDs of user blogs in a comma-separated list for use in SQL statements
-function bp_get_blog_ids_of_user( $id, $all = false ) {
-        $blogs = get_blogs_of_user( $id, $all );
-        $blog_ids = "";
-        
-        if ( $blogs && count($blogs) > 0 ){
-                foreach( $blogs as $blog ) {
-                        $blog_ids .= $blog->blog_id.",";
-                }
-        }
-        $blog_ids = trim( $blog_ids, "," );
-        return $blog_ids;
-}
-
-// return a tick for a checkbox for a true boolean value
-function bp_boolean_ticked($bool) {
-        if ( $bool ) {
-                return " checked=\"checked\"";
-        }
-        return "";
-}
-
-// return a tick for a checkbox for a particular value
-function bp_value_ticked( $var, $value ) {
-        if ( $var == $value ) {
-                return " checked=\"checked\"";
-        }
-        return "";
-}
-
-// return true for a boolean value from a checkbox
-function bp_boolean( $value = 0 ) {
-        if ( $value != "" ) {
-                return 1;
-        } else {
-                return 0;
-        }
-}
-
-// return an integer
-function bp_int( $var, $nullToOne=false ) {
-        if ( @$var == "" ) {
-                if ( $nullToOne ) {
-                        return 1;
-                } else {
-                        return 0;
-                }
-        } else {
-                return (int)$var;
-        }
-}
-
-
-// show a friendly date
-function bp_friendly_date($timestamp) {
-        // set the timestamp to now if it hasn't been given
-        if ( strlen($timestamp) == 0 )
-                $timestamp = time();
-        
-        // create the date string
-        if ( date( "m", $timestamp ) == date("m") && date( "d", $timestamp ) == date("d") - 1 && date( "Y", $timestamp ) == date("Y") ) {
-                return "yesterday at " . date( "g:i a", $timestamp );
-        } else if ( date( "m", $timestamp ) == date("m") && date( "d", $timestamp ) == date("d") && date( "Y", $timestamp ) == date("Y") ) {
-                return "at " . date( "g:i a", $timestamp );
-        } else if ( date( "m", $timestamp) == date("m") && date( "d", $timestamp ) > date("d") - 5 && date( "Y", $timestamp ) == date("Y") ) {
-                return "on " . date( "l", $timestamp ) . " at " . date( "g:i a", $timestamp );
-        } else if ( date( "Y", $timestamp) == date("Y") ) {
-                return "on " . date( "F jS", $timestamp );
-        } else {
-                return "on " . date( "F jS Y", $timestamp );
-        }
-}
-
-// search users
-function bp_search_users( $q, $start = 0, $num = 10 ) {
-        if ( trim($q) != "" ) {
-                global $wpdb;
-                global $current_user;
-                
-                $sql = "SELECT SQL_CALC_FOUND_ROWS id, user_login, display_name, user_nicename
-                                FROM " . $wpdb->base_prefix . "users
-                                WHERE (user_nicename like '%" . $wpdb->escape($q) . "%'
-                                OR user_email like '%" . $wpdb->escape($q) . "%'
-                                OR display_name like '%" . $wpdb->escape($q) . "%')
-                                AND (id <> " . $current_user->ID . " and id > 1)
-                                LIMIT " . $wpdb->escape($start) . ", " . $wpdb->escape($num) . ";";
-
-                if ( !$users = $wpdb->get_results($sql) ) {
-                        return false;
-                }
-                
-                $rows = $wpdb->get_var( "SELECT found_rows() AS found_rows" );
-                
-                if ( is_array($users) && count($users) > 0 ) {
-                        for ( $i = 0; $i < count($users); $i++ ) {
-                                $user          = $users[$i];
-                                $user->siteurl = $user->user_url;
-                                $user->blogs   = "";
-                                $user->blogs   = get_blogs_of_user($user->id);
-                                $user->rows    = $rows;
-                        }
-                        return $users;
-                } else {
-                        return false;
-                }
-        } else {
-                return false;
-        }
-}
-
-// return a ' if the text ends in an "s", or "'s" otherwise
-function bp_end_with_s( $string ) {
-        if ( substr( strtolower($string), - 1 ) == "s" ) {
-                return $string . "'";
-        } else {
-                return $string . "'s";
-        }
-}
-
-// pluralise a string
-function bp_plural( $num, $ifone = "", $ifmore = "s" ) {
-        if ( bp_int($num) != 1 ) {
-                return $ifmore;
-        } else {
-                return $ifone;
-        }
-}
-
 function bp_is_serialized( $data ) {
    if ( trim($data) == "" ) {

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

@@ -2 +2 @@
 
 function bp_get_nav() {
-        global $bp_nav, $current_component;
+        global $bp_nav, $current_component, $current_userid, $loggedin_userid;
         
         for ( $i = 0; $i < count($bp_nav); $i++ ) {
-                if ( $current_component == $bp_nav[$i]['id'] ) {
+                if ( $current_component == $bp_nav[$i]['id'] && $current_userid == $loggedin_userid ) {
                         $selected = ' class="current"';
                 } else {

trunk/bp-xprofile.php

@@ -136 +136 @@
 
 function xprofile_setup_nav() {
-        global $source_domain, $bp_nav, $bp_options_nav, $bp_xprofile_slug;
-
+        global $loggedin_domain, $bp_nav, $bp_options_nav;
+        global $loggedin_userid, $current_userid, $bp_xprofile_slug;
+        
         $bp_nav[0] = array(
                 'id'    => $bp_xprofile_slug,
                 'name'  => 'Profile', 
-                'link'  => $source_domain . $bp_xprofile_slug
+                'link'  => $loggedin_domain . $bp_xprofile_slug
         );
 
-        $bp_options_nav[$bp_xprofile_slug] = array(
-                ''                 => array( 
-                        'name' => __('Publically Viewable'),
-                        'link' => $source_domain . $bp_xprofile_slug . '/' ),
-                'edit'                  => array(
-                        'name' => __('Edit Profile'),
-                        'link' => $source_domain . $bp_xprofile_slug . '/edit' ),
-                'change-avatar' => array( 
-                        'name' => __('Change Avatar'),
-                        'link' => $source_domain . $bp_xprofile_slug . '/change-avatar' )
-        );
+        if ( $loggedin_userid == $current_userid ) {
+                $bp_options_nav[$bp_xprofile_slug] = array(
+                        ''                 => array( 
+                                'name' => __('Publically Viewable'),
+                                'link' => $loggedin_domain . $bp_xprofile_slug . '/' ),
+                        'edit'                  => array(
+                                'name' => __('Edit Profile'),
+                                'link' => $loggedin_domain . $bp_xprofile_slug . '/edit' ),
+                        'change-avatar' => array( 
+                                'name' => __('Change Avatar'),
+                                'link' => $loggedin_domain . $bp_xprofile_slug . '/change-avatar' )
+                );
+        }
 }
 add_action( 'wp', 'xprofile_setup_nav' );
@@ -166 +169 @@
 
 function xprofile_catch_action() {
-        global $bp_xprofile_slug, $current_component, $current_blog, $current_action;
+        global $bp_xprofile_slug, $current_component, $current_blog;
+        global $loggedin_userid, $current_userid, $current_action;
 
         if ( $current_component == $bp_xprofile_slug && $current_blog->blog_id > 1 ) {
-                if ( !$current_action )
+                if ( !$current_action ) {
                         bp_catch_uri( 'profile/index' );
-
-                if ( $current_action == 'edit' && !$action_variables )
+                } else if ( $current_action == 'edit' && !$action_variables && $loggedin_userid == $current_userid ) {
                         bp_catch_uri( 'profile/edit' );
-
-                if ( $current_action == 'change-avatar' )
+                } else if ( $current_action == 'change-avatar' && $loggedin_userid == $current_userid ) {
                         bp_catch_uri( 'profile/change-avatar' );
+                } else {
+                        bp_catch_uri( 'profile/index' );
+                }
         }
 }
@@ -190 +195 @@
 
 function xprofile_profile_template() {
-        global $current_blog, $profile_template, $coreuser_id;
-
-        if ( VHOST == 'yes' ) {
-                $siteuser = explode('.', $current_blog->domain);
-                $siteuser = $siteuser[0];
-        } else {
-                $siteuser = str_replace('/', '', $current_blog->path);
-        }
-
-        $coreuser_id = bp_core_get_userid($siteuser);
-        $profile_template = new BP_XProfile_Template($coreuser_id);
+        global $profile_template, $current_userid;
+
+        $profile_template = new BP_XProfile_Template($current_userid);
 }
 add_action( 'wp_head', 'xprofile_profile_template' );
@@ -212 +209 @@
 
 function xprofile_edit( $group_id = null, $action = null ) {
-        global $wpdb, $bp_xprofile_table_name_groups, $userdata, $source_domain;
+        global $wpdb, $bp_xprofile_table_name_groups, $userdata, $loggedin_domain;
         
         if ( !$group_id ) {     
@@ -225 +222 @@
         
         if ( !$action )
-                $action = $source_domain . 'wp-admin/admin.php?page=xprofile_' . $group->name . '&mode=save';
+                $action = $loggedin_domain . 'wp-admin/admin.php?page=xprofile_' . $group->name . '&mode=save';
 ?>
         <div class="wrap">

trunk/bp-xprofile/bp-xprofile-avatars.php

@@ -67 +67 @@
 
 // Main UI Rendering
-function xprofile_avatar_admin($message = null) {
+function xprofile_avatar_admin($message = null, $action = null) {
         ?>      
         <?php if ( !isset($_POST['slick_avatars_action']) && !isset($_GET['slick_avatars_action']) ) { ?>
@@ -84 +84 @@
                 
                 <?php
-                $action = get_option('home') . '/wp-admin/admin.php?page=bp-xprofile.php';
+                if ( !$action )
+                        $action = get_option('home') . '/wp-admin/admin.php?page=bp-xprofile.php';
+                
                 xprofile_render_avatar_upload_form($action);
 
@@ -128 +130 @@
                 
                 // Render the cropper UI
-                $action = get_option('home') .'/wp-admin/admin.php?page=bp-xprofile.php';
+                if ( !$action )
+                        $action = get_option('home') .'/wp-admin/admin.php?page=bp-xprofile.php';
+                
                 xprofile_render_avatar_cropper($original, $canvas, $action);
                 
@@ -224 +228 @@
 }
 
-function xprofile_render_avatar_cropper($original, $new, $action) {
+function xprofile_render_avatar_cropper($original, $new, $action, $user_id = null) {
         $size = getimagesize($new);
         
-        // Get the URL to access the uploaded file
-        $url = get_usermeta( get_current_user_id(), 'source_domain' );
+        if ( !$user_id )
+                $user_id = get_current_user_id();
+        
+        if ( VHOST == 'yes' ) {
+                $url = 'http://' . get_usermeta( $user_id, 'source_domain' ) . '/';
+        } else {
+                $url = 'http://' . get_usermeta( $user_id, 'source_domain' ) . '/' . get_usermeta( $user_id, 'nickname' ) . '/';
+        }
+
         $src = str_replace( array(ABSPATH), array($url . '/'), $new );
-        
+
         // Load cropper details
         
@@ -354 +365 @@
         if ( !$user_id )
                 $user_id = get_current_user_id();
+                
+        if ( VHOST == 'yes' ) {
+                $src = 'http://' . get_usermeta( $user_id, 'source_domain' ) . '/';
+        } else {
+                $src = 'http://' . get_usermeta( $user_id, 'source_domain' ) . '/' . get_usermeta( $user_id, 'nickname' ) . '/';
+        }
         
         $old = get_usermeta( $user_id, 'xprofile_avatar_v1_path' );
-        $v1_href = str_replace( array(ABSPATH), array( 'http://' . get_usermeta( get_current_user_id(), 'source_domain' ) . '/' ), $vars['v1_out'] );
+        $v1_href = str_replace( array(ABSPATH), array($src), $vars['v1_out'] );
         update_usermeta( $user_id, 'xprofile_avatar_v1', $v1_href );
         update_usermeta( $user_id, 'xprofile_avatar_v1_path', $vars['v1_out'] );
@@ -363 +380 @@
         if ( XPROFILE_AVATAR_V2_W !== false && XPROFILE_AVATAR_V2_H !== false ) {
                 $old = get_usermeta( $user_id, 'xprofile_avatar_v2_path' );
-                $v2_href = str_replace( array(ABSPATH), array( 'http://' . get_usermeta( get_current_user_id(), 'source_domain' ) . '/' ), $vars['v2_out'] );
+                $v2_href = str_replace( array(ABSPATH), array($src), $vars['v2_out'] );
                 update_usermeta( $user_id, 'xprofile_avatar_v2', $v2_href );
                 update_usermeta( $user_id, 'xprofile_avatar_v2_path', $vars['v2_out'] );

trunk/bp-xprofile/bp-xprofile-classes.php

@@ -1077 +1077 @@
         
         function get_value_byid( $field_id, $user_id = null ) {
-                global $wpdb, $coreuser_id, $bp_xprofile_table_name_data;
+                global $wpdb, $current_userid, $bp_xprofile_table_name_data;
 
                 if ( !$user_id )
-                        $user_id = $coreuser_id;
+                        $user_id = $current_userid;
 
                 $sql = $wpdb->prepare("SELECT * FROM $bp_xprofile_table_name_data WHERE field_id = %d AND user_id = %d", $field_id, $user_id );
@@ -1092 +1092 @@
         
         function get_value_byfieldname( $fields, $user_id = null ) {
-                global $coreuser_id, $wpdb, $bp_xprofile_table_name_fields, $bp_xprofile_table_name_data;
+                global $current_userid, $wpdb, $bp_xprofile_table_name_fields, $bp_xprofile_table_name_data;
 
                 if ( !$fields )
@@ -1098 +1098 @@
 
                 if ( !$user_id )
-                        $user_id = $coreuser_id;
+                        $user_id = $current_userid;
 
                 if ( is_array($fields) ) {

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

@@ -291 +291 @@
 function xprofile_on_activate( $blog_id = null, $user_id = null ) {
         global $wpdb, $profile_picture_path;
-        
+
         // 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, 
@@ -302 +302 @@
                         AND um.meta_key = 'primary_blog'
                         AND um.meta_value = " . $blog_id;
-                        
+
         $user_id = $wpdb->get_var($sql); 
 
@@ -326 +326 @@
         if ( $resized && $original ) {
                 $upload_dir = bp_upload_dir(NULL, $blog_id);
-                
+
                 if ( $upload_dir ) {
                         $resized_strip_path = explode( '/', $resized );
@@ -349 +349 @@
                 // Render the cropper UI
                 $action = 'http://' . get_usermeta( $user_id, 'source_domain' ) . '/wp-activate.php?key=' . $_GET['key'] . '&cropped=true';
-                xprofile_render_avatar_cropper($original, $resized, $action);
+                xprofile_render_avatar_cropper($original, $resized, $action, $user_id);
                 
                 //$result = xprofile_avatar_cropstore( $image, $image, $v1_x, $v1_y, XPROFILE_AVATAR_V1_W, XPROFILE_AVATAR_V1_H, $v2_x, $v2_y, XPROFILE_AVATAR_V2_W, XPROFILE_AVATAR_V2_H, true );
@@ -368 +368 @@
                 
                 $user_id = xprofile_get_user_by_key($_GET['key']);
-                
+
                 if ( $user_id && isset($_POST['orig']) && isset($_POST['canvas']) ) {
+                        echo "test is in here";
                         xprofile_check_crop( $_POST['orig'], $_POST['canvas'] );
                         $result = xprofile_avatar_cropstore( $_POST['orig'], $_POST['canvas'], $_POST['v1_x1'], $_POST['v1_y1'], $_POST['v1_w'], $_POST['v1_h'], $_POST['v2_x1'], $_POST['v2_y1'], $_POST['v2_w'], $_POST['v2_h'] );
                         xprofile_avatar_save($result, $user_id);
                 }
-
+                
                 if ( VHOST == 'yes' ) {
-                        header('Location: http://' . $_SERVER['HTTP_HOST']);
+                        $url = 'http://' . get_usermeta( $user_id, 'source_domain' ) . '/';
                 } else {
-                        $path = explode( '/', $_SERVER['REQUEST_URI'] );
-                        header( 'Location:' . $path[0] . $path[1] . $path[2] );
+                        $url = 'http://' . get_usermeta( $user_id, 'source_domain' ) . '/' . get_usermeta( $user_id, 'nickname' );
                 }
+                
+                header("Location: $url");
         }
 }

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

@@ -210 +210 @@
 
 function bp_the_avatar() {
-        global $coreuser_id;
-        echo xprofile_get_avatar( $coreuser_id, 2 );
+        global $current_userid;
+        echo xprofile_get_avatar( $current_userid, 2 );
 }
 
 function bp_the_avatar_thumbnail() {
-        global $coreuser_id;
-        echo xprofile_get_avatar( $coreuser_id, 1 );
+        global $current_userid;
+        echo xprofile_get_avatar( $current_userid, 1 );
 }
 
 function bp_loggedinuser_avatar_thumbnail() {
-        global $current_user;
-        echo xprofile_get_avatar( $current_user->ID, 1 );
+        global $loggedin_userid;
+        echo xprofile_get_avatar( $loggedin_userid, 1 );
 }
 
 function bp_user_fullname($user_id = false) {
-        global $coreuser_id;
+        global $current_userid;
         
         if ( !$user_id )
-                $user_id = $coreuser_id;
+                $user_id = $current_userid;
         
         $data = bp_get_field_data( array( 'First Name', 'Last Name' ) );
@@ -248 +248 @@
 
 function bp_profile_group_tabs() {
-        global $source_domain, $bp_xprofile_slug, $group_name;
+        global $loggedin_domain, $bp_xprofile_slug, $group_name;
         
         $groups = BP_XProfile_Group::get_all();
@@ -262 +262 @@
                 }
 
-                echo '<li' . $selected . '><a href="' . $source_domain . $bp_xprofile_slug . '/edit/group/' . $groups[$i]->id . '">' . $groups[$i]->name . '</a></li>';
+                echo '<li' . $selected . '><a href="' . $loggedin_domain . $bp_xprofile_slug . '/edit/group/' . $groups[$i]->id . '">' . $groups[$i]->name . '</a></li>';
         }
 }
@@ -284 +284 @@
 
 function bp_edit_profile_form() {
-        global $action_variables, $source_domain, $bp_xprofile_slug;
+        global $action_variables, $loggedin_domain, $bp_xprofile_slug;
 
         $group_id = $action_variables[1];
@@ -291 +291 @@
                 $group_id = 1; // 'Basic' group.
         
-        xprofile_edit( $group_id, $source_domain . $bp_xprofile_slug . '/edit/group/' . $group_id . '/?mode=save' );
-}
-
-
+        xprofile_edit( $group_id, $loggedin_domain . $bp_xprofile_slug . '/edit/group/' . $group_id . '/?mode=save' );
+}
+
+function bp_avatar_upload_form() {
+        global $loggedin_domain, $bp_xprofile_slug;
+         
+        xprofile_avatar_admin(null, $loggedin_domain . $bp_xprofile_slug . '/change-avatar/');
+}