Changeset 1530

Timestamp:

06/09/2009 08:57:57 PM (16 years ago)

Author:

apeatling

Message:

Fixes #777

File:

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

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

@@ -1 +1 @@
 <?php
+
+function xprofile_clear_signup_cookie() {
+    if ( $_POST['stage'] != 'validate-blog-signup' && $_POST['stage'] != 'validate-user-signup' )
+        setcookie( 'bp_xprofile_meta', false, time()-1000, COOKIEPATH );
+}
+add_action( 'init', 'xprofile_clear_signup_cookie' );
 
 /**************************************************************************
@@ -95 +101 @@
     
     extract($result);
-    
+
     if ( $bp_signup_has_errors || $bp_signup_avatar_has_errors )
         $errors->add( 'bp_xprofile_errors', '' );
@@ -104 +110 @@
 
 function xprofile_add_profile_meta( $meta ) {
-    global $bp, $bp_blog_signup_meta;
+    global $bp, $bp_blog_signup_meta, $bp_user_signup_meta;
     
     if ( $_POST['stage'] == 'validate-blog-signup' ) {
         $bp_meta = $bp_blog_signup_meta;
     } else if ( $_POST['stage'] == 'validate-user-signup' ) {
-        $bp_meta = unserialize( stripslashes( $_COOKIE['bp_xprofile_meta'] ) );
+        $bp_meta = $bp_user_signup_meta;
     } else {
         $bp_meta = $meta;
@@ -124 +130 @@
     global $current_site, $active_signup;
     global $wp_upload_error;
+    global $bp_user_signup_meta;
 
     if ( $_POST['stage'] != 'validate-user-signup' ) return;
-    
+
     $counter = 0;
     $bp_signup_has_errors = false;
@@ -176 +183 @@
     
     // validate the avatar upload if there is one.
-    $avatar_error = false;
+    $bp_signup_avatar_has_errors = false;
     $checked_upload = false;
     $checked_size = false;
@@ -222 +229 @@
     }
 
-    if ( !$bp_signup_has_errors && !$bp_signup_avatar_has_errors ) {
-        /* Destroy and existing cookies */
-        setcookie( 'bp_xprofile_meta', false, time()-1000, COOKIEPATH );
-        
+    if ( !$bp_signup_has_errors && !$bp_signup_avatar_has_errors ) {        
         $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++ ) {
-            $bp_meta['field_' . $bp_xprofile_callback[$i]['field_id']] .= $bp_xprofile_callback[$i]['value'];
-        }
-
-        $bp_meta['xprofile_field_ids'] = $_POST['xprofile_ids'];
-        $bp_meta['avatar_image_resized'] = $canvas;
-        $bp_meta['avatar_image_original'] = $original;
-        
-        setcookie( 'bp_xprofile_meta', serialize($bp_meta), time()+60*60*24, COOKIEPATH );
+            $bp_user_signup_meta['field_' . $bp_xprofile_callback[$i]['field_id']] .= $bp_xprofile_callback[$i]['value'];
+        }
+
+        $bp_user_signup_meta['xprofile_field_ids'] = $_POST['xprofile_ids'];
+        $bp_user_signup_meta['avatar_image_resized'] = $canvas;
+        $bp_user_signup_meta['avatar_image_original'] = $original;
+        
+        setcookie( 'bp_xprofile_meta', serialize($bp_user_signup_meta), time()+60*60*24, COOKIEPATH );
     }
 }
@@ -246 +250 @@
     
     if ( $_POST['stage'] != 'validate-blog-signup' ) return;
-
+    
     $blog_meta = array( 
         'public' => $_POST['blog_public'],
@@ -277 +281 @@
 
 
-function xprofile_on_activate_user( $user_id, $password, $meta ) {
+function xprofile_on_activate_user( $user_id, $password, $meta ) {  
     xprofile_extract_signup_meta( $user_id, $meta );