summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2012-10-18 09:52:45 +0200
committerAleksander Machniak <alec@alec.pl>2012-10-18 09:52:45 +0200
commitdf95e790ba49464dd6b093f0c45777288f738d7d (patch)
treeb1b60c9d5bcd5df0e3d7d3beeaec60b1edfd8053 /program
parent84f2a72408a20e4e0eac7383aba9f4f672e61f9c (diff)
Remove automatic to-lowercase conversion of usernames (#1488715)
Diffstat (limited to 'program')
-rw-r--r--program/include/rcmail.php20
1 files changed, 5 insertions, 15 deletions
diff --git a/program/include/rcmail.php b/program/include/rcmail.php
index ec3d537ec..0c2bf64b4 100644
--- a/program/include/rcmail.php
+++ b/program/include/rcmail.php
@@ -452,6 +452,10 @@ class rcmail extends rcube
$username .= '@'.rcube_utils::parse_host($config['username_domain'], $host);
}
+ if (!isset($config['login_lc'])) {
+ $config['login_lc'] = 2; // default
+ }
+
// Convert username to lowercase. If storage backend
// is case-insensitive we need to store always the same username (#1487113)
if ($config['login_lc']) {
@@ -483,21 +487,7 @@ class rcmail extends rcube
$storage = $this->get_storage();
// try to log in
- if (!($login = $storage->connect($host, $username, $pass, $port, $ssl))) {
- // try with lowercase
- $username_lc = mb_strtolower($username);
- if ($username_lc != $username) {
- // try to find user record again -> overwrite username
- if (!$user && ($user = rcube_user::query($username_lc, $host)))
- $username_lc = $user->data['username'];
-
- if ($login = $storage->connect($host, $username_lc, $pass, $port, $ssl))
- $username = $username_lc;
- }
- }
-
- // exit if login failed
- if (!$login) {
+ if (!$storage->connect($host, $username, $pass, $port, $ssl)) {
return false;
}