Changeset 167 for trunk/bp-xprofile/bp-xprofile-signup.php

Timestamp:

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

Author:

apeatling

Message:

Fixed issues with subdirectory WPMU installations and BuddyPress

Files:

• trunk/bp-xprofile/bp-xprofile-signup.php (modified) (5 diffs)

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");
         }
 }