mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #23734 from nextcloud/backport/23720/stable19 

[stable19] save email as lower case
This commit is contained in:
Morris Jobke 2020-10-28 08:49:10 +01:00 committed by GitHub
parent aa81a3045e fdc70c08c6
commit 4d20a63d4f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/settings/lib/Controller/UsersController.php
View File

@ -343,6 +343,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(
[ [
@ -422,7 +423,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']
) { ) {