diff options
| author | Pytal <24800714+Pytal@users.noreply.github.com> | 2021-12-13 16:11:36 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-13 16:11:36 -0800 |
| commit | 09915ec15e59f8a6ae646db255221c3a4ec23181 (patch) | |
| tree | 295718aea0c1f179e5bca025055d2e6a900a1aa1 /lib | |
| parent | af98f52eacab4c8731063c5261f4b1267fb25cf9 (diff) | |
| parent | dbae781a262eff7f94c51857e979ff43cbd51a57 (diff) | |
| download | nextcloud-server-09915ec15e59f8a6ae646db255221c3a4ec23181.tar.gz nextcloud-server-09915ec15e59f8a6ae646db255221c3a4ec23181.zip | |
Merge pull request #30197 from nextcloud/bugfix/noid/always-store-email-lowercase
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/composer/composer/autoload_classmap.php | 1 | ||||
| -rw-r--r-- | lib/composer/composer/autoload_static.php | 1 | ||||
| -rw-r--r-- | lib/private/AllConfig.php | 15 |
3 files changed, 14 insertions, 3 deletions
diff --git a/lib/composer/composer/autoload_classmap.php b/lib/composer/composer/autoload_classmap.php index 9d9921fdfd7..5587f959b6e 100644 --- a/lib/composer/composer/autoload_classmap.php +++ b/lib/composer/composer/autoload_classmap.php @@ -988,6 +988,7 @@ return array( 'OC\\Core\\Migrations\\Version23000Date20210906132259' => $baseDir . '/core/Migrations/Version23000Date20210906132259.php', 'OC\\Core\\Migrations\\Version23000Date20210930122352' => $baseDir . '/core/Migrations/Version23000Date20210930122352.php', 'OC\\Core\\Migrations\\Version23000Date20211203110726' => $baseDir . '/core/Migrations/Version23000Date20211203110726.php', + 'OC\\Core\\Migrations\\Version24000Date20211210141942' => $baseDir . '/core/Migrations/Version24000Date20211210141942.php', 'OC\\Core\\Notification\\CoreNotifier' => $baseDir . '/core/Notification/CoreNotifier.php', 'OC\\Core\\Service\\LoginFlowV2Service' => $baseDir . '/core/Service/LoginFlowV2Service.php', 'OC\\DB\\Adapter' => $baseDir . '/lib/private/DB/Adapter.php', diff --git a/lib/composer/composer/autoload_static.php b/lib/composer/composer/autoload_static.php index d6d834a829e..a4d8b9d95f3 100644 --- a/lib/composer/composer/autoload_static.php +++ b/lib/composer/composer/autoload_static.php @@ -1017,6 +1017,7 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c 'OC\\Core\\Migrations\\Version23000Date20210906132259' => __DIR__ . '/../../..' . '/core/Migrations/Version23000Date20210906132259.php', 'OC\\Core\\Migrations\\Version23000Date20210930122352' => __DIR__ . '/../../..' . '/core/Migrations/Version23000Date20210930122352.php', 'OC\\Core\\Migrations\\Version23000Date20211203110726' => __DIR__ . '/../../..' . '/core/Migrations/Version23000Date20211203110726.php', + 'OC\\Core\\Migrations\\Version24000Date20211210141942' => __DIR__ . '/../../..' . '/core/Migrations/Version24000Date20211210141942.php', 'OC\\Core\\Notification\\CoreNotifier' => __DIR__ . '/../../..' . '/core/Notification/CoreNotifier.php', 'OC\\Core\\Service\\LoginFlowV2Service' => __DIR__ . '/../../..' . '/core/Service/LoginFlowV2Service.php', 'OC\\DB\\Adapter' => __DIR__ . '/../../..' . '/lib/private/DB/Adapter.php', diff --git a/lib/private/AllConfig.php b/lib/private/AllConfig.php index 40a52b16628..ac2f9d7bf45 100644 --- a/lib/private/AllConfig.php +++ b/lib/private/AllConfig.php @@ -260,6 +260,10 @@ class AllConfig implements \OCP\IConfig { // TODO - FIXME $this->fixDIInit(); + if ($appName === 'settings' && $key === 'email') { + $value = strtolower((string) $value); + } + $prevValue = $this->getUserValue($userId, $appName, $key, null); if ($prevValue !== null) { @@ -514,17 +518,22 @@ class AllConfig implements \OCP\IConfig { // TODO - FIXME $this->fixDIInit(); + if ($appName === 'settings' && $key === 'email') { + // Email address is always stored lowercase in the database + return $this->getUsersForUserValue($appName, $key, strtolower($value)); + } + $sql = 'SELECT `userid` FROM `*PREFIX*preferences` ' . 'WHERE `appid` = ? AND `configkey` = ? '; if ($this->getSystemValue('dbtype', 'sqlite') === 'oci') { //oracle hack: need to explicitly cast CLOB to CHAR for comparison - $sql .= 'AND LOWER(to_char(`configvalue`)) = LOWER(?)'; + $sql .= 'AND LOWER(to_char(`configvalue`)) = ?'; } else { - $sql .= 'AND LOWER(`configvalue`) = LOWER(?)'; + $sql .= 'AND LOWER(`configvalue`) = ?'; } - $result = $this->connection->executeQuery($sql, [$appName, $key, $value]); + $result = $this->connection->executeQuery($sql, [$appName, $key, strtolower($value)]); $userIDs = []; while ($row = $result->fetch()) { |