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

[stable20] save email as lower case
This commit is contained in:
Morris Jobke 2020-10-28 08:49:29 +01:00 committed by GitHub
commit 21e9ec1f08
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions

View File

@ -360,6 +360,7 @@ class UsersController extends Controller {
$twitter, $twitter,
$twitterScope $twitterScope
) { ) {
$email = strtolower($email);
if (!empty($email) && !$this->mailer->validateMailAddress($email)) { if (!empty($email) && !$this->mailer->validateMailAddress($email)) {
return new DataResponse( return new DataResponse(
[ [
@ -438,7 +439,7 @@ class UsersController extends Controller {
} }
} }
$oldEmailAddress = $user->getEMailAddress(); $oldEmailAddress = $user->getEMailAddress();
$oldEmailAddress = is_null($oldEmailAddress) ? '' : $oldEmailAddress; $oldEmailAddress = is_null($oldEmailAddress) ? '' : strtolower($oldEmailAddress);
if (isset($data[AccountManager::PROPERTY_EMAIL]['value']) if (isset($data[AccountManager::PROPERTY_EMAIL]['value'])
&& $oldEmailAddress !== $data[AccountManager::PROPERTY_EMAIL]['value'] && $oldEmailAddress !== $data[AccountManager::PROPERTY_EMAIL]['value']
) { ) {