Merge pull request #23733 from nextcloud/backport/23720/stable20

MorrisJobke · web-flow · commit 21e9ec1f0896 · 2020-10-28T08:49:29.000+01:00
[stable20] save email as lower case
diff --git a/apps/settings/lib/Controller/UsersController.php b/apps/settings/lib/Controller/UsersController.php
@@ -360,6 +360,7 @@ public function setUserSettings($avatarScope,
 									$twitter,
 									$twitterScope
 	) {
+		$email = strtolower($email);
 		if (!empty($email) && !$this->mailer->validateMailAddress($email)) {
 			return new DataResponse(
 				[
@@ -438,7 +439,7 @@ protected function saveUserSettings(IUser $user, array $data) {
 			}
 		}
 		$oldEmailAddress = $user->getEMailAddress();
-		$oldEmailAddress = is_null($oldEmailAddress) ? '' : $oldEmailAddress;
+		$oldEmailAddress = is_null($oldEmailAddress) ? '' : strtolower($oldEmailAddress);
 		if (isset($data[AccountManager::PROPERTY_EMAIL]['value'])
 			&& $oldEmailAddress !== $data[AccountManager::PROPERTY_EMAIL]['value']
 		) {

Original file line number	Diff line number	Diff line change
`@@ -360,6 +360,7 @@ public function setUserSettings($avatarScope,`
`360`	`360`	`$twitter,`
`361`	`361`	`$twitterScope`
`362`	`362`	`) {`
	`363`	`+ $email = strtolower($email);`
`363`	`364`	`if (!empty($email) && !$this->mailer->validateMailAddress($email)) {`
`364`	`365`	`return new DataResponse(`
`365`	`366`	`[`
`@@ -438,7 +439,7 @@ protected function saveUserSettings(IUser $user, array $data) {`
`438`	`439`	`}`
`439`	`440`	`}`
`440`	`441`	`$oldEmailAddress = $user->getEMailAddress();`
`441`		`- $oldEmailAddress = is_null($oldEmailAddress) ? '' : $oldEmailAddress;`
	`442`	`+ $oldEmailAddress = is_null($oldEmailAddress) ? '' : strtolower($oldEmailAddress);`
`442`	`443`	`if (isset($data[AccountManager::PROPERTY_EMAIL]['value'])`
`443`	`444`	`&& $oldEmailAddress !== $data[AccountManager::PROPERTY_EMAIL]['value']`
`444`	`445`	`) {`