Changeset 5832

Timestamp:

02/23/2012 07:27:29 AM (14 years ago)

Author:

johnjamesjacoby

Message:

Tweak general settings logic to include boolean for successfully changed email address. See #4038, #4010.

File:

• trunk/bp-settings/bp-settings-actions.php (modified) (6 diffs)

trunk/bp-settings/bp-settings-actions.php

@@ -47 +47 @@
         $pass_error    = false;   // invalid|mismatch|empty|nochange
         $pass_changed  = false;   // true if the user changes their password
+        $email_changed = false;   // true if the user changes their email
         $feedback_type = 'error'; // success|error
         $feedback      = array(); // array of strings for feedback
 
-        /** Handle Form ***********************************************************/
 
         if ( isset( $_POST['submit'] ) ) {
@@ -69 +69 @@
                                 $user_email = sanitize_email( esc_html( trim( $_POST['email'] ) ) );
 
-                                // Skip this if no change to email
+                                // User is changing email address
                                 if ( $bp->displayed_user->userdata->user_email != $user_email ) {
 
@@ -93 +93 @@
                                         }
 
+                                        // Yay we made it!
+                                        if ( false === $email_error ) {
+                                                $update_user->user_email = $user_email;
+                                                $email_changed = true;
+                                        }
+
                                 // No change
                                 } else {
-                                        $email_error = 'nochange';
-                                }
-
-                                // Yay we made it!
-                                if ( false === $email_error ) {
-                                        $update_user->user_email = $user_email;
+                                        $email_error = false;
                                 }
 
@@ -124 +125 @@
                         // Both password fields were empty
                         } elseif ( empty( $_POST['pass1'] ) && empty( $_POST['pass2'] ) ) {
-                                $pass_error = 'nochange';
+                                $pass_error = false;
 
                         // One of the password boxes was left empty
@@ -169 +170 @@
                                 $feedback['email_empty']    = __( 'Email address cannot be empty.', 'buddypress' );
                                 break;
-                        case 'nochange' :
-                                $email_error = false;
+                        case false :
+                                // No change
                                 break;
                 }
@@ -185 +186 @@
                                 $feedback['pass_empty']    = __( 'One of the password fields was empty.', 'buddypress' );
                                 break;
-                        case 'nochange' :
-                                $pass_error = false;
+                        case false :
+                                // No change
                                 break;
                 }
 
                 // No errors so show a simple success message
-                if ( ( false === $email_error ) && ( ( false == $pass_error ) && ( true === $pass_changed ) ) ) {
+                if ( ( ( false === $email_error ) || ( false == $pass_error ) ) && ( ( true === $pass_changed ) || ( true === $email_changed ) ) ) {
                         $feedback[]    = __( 'Your settings have been saved.', 'buddypress' );
                         $feedback_type = 'success';
 
                 // Some kind of errors occurred
-                } elseif ( ( false === $email_error ) && ( ( false == $pass_error ) && ( false === $pass_changed ) ) ) {
+                } elseif ( ( ( false === $email_error ) || ( false === $pass_error ) ) && ( ( false === $pass_changed ) || ( false === $email_changed ) ) ) {
                         if ( bp_is_my_profile() ) {
                                 $feedback['nochange'] = __( 'No changes were made to your account.', 'buddypress' );