X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fprofilesettings.php;h=44243f310d95adcd8318b910c81f0d5b28643332;hb=f374e924f51d50a601bef4beeb138665374485b0;hp=19157e9ca18e34782904f4fc63ca0b74d9f7fb3f;hpb=785ea92bb7c9701eaf7f68e2d5621e53f5bce7f2;p=quix0rs-gnu-social.git

diff --git a/actions/profilesettings.php b/actions/profilesettings.php
index 19157e9ca1..44243f310d 100644
--- a/actions/profilesettings.php
+++ b/actions/profilesettings.php
@@ -80,7 +80,7 @@ class ProfilesettingsAction extends SettingsAction {
 
 		# Some validation
 		
-		if (!Validate::email($email, true)) {
+		if ($email && !Validate::email($email, true)) {
 			$this->show_form(_t('Not a valid email address.'));
 			return;
 		} else if (!Validate::string($nickname, array('min_length' => 1,
@@ -88,6 +88,9 @@ class ProfilesettingsAction extends SettingsAction {
 													  'format' => VALIDATE_NUM . VALIDATE_ALPHA_LOWER))) {
 			$this->show_form(_t('Nickname must have only letters and numbers and no spaces.'));
 			return;
+		} else if (!User::allowed_nickname($nickname)) {
+			$this->show_form(_t('Not a valid nickname.'));
+			return;
 		} else if (!is_null($homepage) && (strlen($homepage) > 0) &&
 				   !Validate::uri($homepage, array('allowed_schemes' => array('http', 'https')))) {
 			$this->show_form(_t('Homepage is not a valid URL.'));
@@ -110,30 +113,40 @@ class ProfilesettingsAction extends SettingsAction {
 		}
 		
 		$user = common_current_user();
-		assert(!is_null($user)); # should already be checked
 
 		$user->query('BEGIN');
 
-		$original = clone($user);
-		
-		$user->nickname = $nickname;
+		if ($user->nickname != $nickname) {
+			
+			common_debug('Updating user nickname from ' . $user->nickname . ' to ' . $nickname,
+						 __FILE__);
+			
+			$original = clone($user);
 		
-		$result = $user->updateKeys($original);
+			$user->nickname = $nickname;
+
+			$result = $user->updateKeys($original);
 		
-		if ($result === FALSE) {
-			common_log_db_error($user, 'UPDATE', __FILE__);
-			common_server_error(_t('Couldnt update user.'));
-			return;
+			if ($result === FALSE) {
+				common_log_db_error($user, 'UPDATE', __FILE__);
+				common_server_error(_t('Couldnt update user.'));
+				return;
+			}
 		}
 
 		if ($user->email != $email) {
 			
+			common_debug('Updating user email from ' . $user->email . ' to ' . $email,
+						 __FILE__);
+			
 			# We don't update email directly; it gets done by confirmemail
+
+			$confirm = new Confirm_address();
 			
-			$confirm = new Confirm_email();
-			$confirm->code = common_good_rand(16);
+			$confirm->code = common_confirmation_code(128);
 			$confirm->user_id = $user->id;
-			$confirm->email = $email;
+			$confirm->address = $email;
+			$confirm->address_type = 'email';
 			
 			$result = $confirm->insert();
 			
@@ -142,6 +155,7 @@ class ProfilesettingsAction extends SettingsAction {
 				common_server_error(_t('Couldnt confirm email.'));
 				return FALSE;
 			}
+			
 			# XXX: try not to do this in the middle of a transaction
 		
 			mail_confirm_address($confirm->code,
@@ -160,6 +174,9 @@ class ProfilesettingsAction extends SettingsAction {
 		$profile->location = $location;
 		$profile->profileurl = common_profile_url($nickname);
 
+		common_debug('Old profile: ' . common_log_objstring($orig_profile), __FILE__);
+		common_debug('New profile: ' . common_log_objstring($profile), __FILE__);
+		
 		$result = $profile->update($orig_profile);
 		
 		if (!$result) {
@@ -194,4 +211,4 @@ class ProfilesettingsAction extends SettingsAction {
 			return $other->id != $user->id;
 		}
 	}
-}
\ No newline at end of file
+}