bug 1707875: check for existing email address before applying it

1 files changed, 10 insertions, 7 deletions

diff --git a/preferences.php b/preferences.php
index 060a279..b1c6576 100644
--- a/preferences.php
+++ b/preferences.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * $Header: /cvsroot/bitweaver/_bit_users/preferences.php,v 1.45 2007/06/01 15:16:48 squareing Exp $
+ * $Header: /cvsroot/bitweaver/_bit_users/preferences.php,v 1.46 2007/06/14 08:24:25 squareing Exp $
  *
  * Copyright (c) 2004 bitweaver.org
  * Copyright (c) 2003 tikwiki.org
@@ -8,7 +8,7 @@
  * All Rights Reserved. See copyright.txt for details and a complete list of authors.
  * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details
  *
- * $Id: preferences.php,v 1.45 2007/06/01 15:16:48 squareing Exp $
+ * $Id: preferences.php,v 1.46 2007/06/14 08:24:25 squareing Exp $
  * @package users
  * @subpackage functions
  */
@@ -25,6 +25,8 @@ if( !$gBitUser->isRegistered() ) {
 	$gBitSystem->fatalError( tra( "You are not logged in" ));
 }
 
+$feedback = array();
+
 // set up the user we're editing
 if( !empty( $_REQUEST["view_user"] ) && $_REQUEST["view_user"] <> $gBitUser->mUserId ) {
 	$gBitSystem->verifyPermission( 'p_users_admin' );
@@ -177,10 +179,10 @@ if( isset( $_REQUEST['chgemail'] )) {
 		$gBitSystem->fatalError( tra("Invalid password.  Your current password is required to change your email address." ));
 	}
 
-	if( $editUser->change_user_email( $editUser->mUserId, $editUser->mUsername, $_REQUEST['email'], $_REQUEST['pass'] )) {
-		$gBitSmarty->assign( 'successMsg', tra( 'Your email address was updated successfully' ));
-		#make sure udpated value appears on screen repaint
-		$editUser->mInfo['email'] = $_REQUEST['email'];
+	if( $editUser->changeUserEmail( $editUser->mUserId, $_REQUEST['email'] )) {
+		$feedback['success'] = tra( 'Your email address was updated successfully' );
+	} else {
+		$feedback['error'] = $editUser->mErrors;
 	}
 }
 
@@ -204,7 +206,7 @@ if( isset( $_REQUEST["chgpswd"] )) {
 		}
 	}
 	if( $editUser->storePassword( $_REQUEST["pass1"] )) {
-		$gBitSmarty->assign( 'successMsg', tra( 'The password was updated successfully' ));
+		$feedback['success'] = tra( 'The password was updated successfully' );
 	}
 }
 
@@ -239,6 +241,7 @@ $gBitSmarty->assign( 'flags', $flags );
 $editUser->mInfo['users_homepage'] = $editUser->getPreference( 'users_homepage', '' );
 
 $gBitSmarty->assign( 'editUser', $editUser );
+$gBitSmarty->assign( 'feedback', $feedback );
 
 // email scrambling methods
 $scramblingMethods = array( "n", "strtr", "unicode", "x" );