From 6d94ab311ac4ac28c47a7a1d367aa680a7ec23e0 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Sun, 26 Sep 2010 11:06:55 -0400
Subject: [PATCH] Only lower-case user name if first login attempt failed (#1486393) + fix test
---
CHANGELOG | 1 +
tests/modcss.php | 2 +-
program/include/rcmail.php | 16 ++++++++++------
3 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 4069a81..e4a19cf 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail
===========================
+- Only lower-case user name if first login attempt failed (#1486393)
- Make alias setting in squirrelmail_usercopy plugin configurable (patch by pommi, #1487007)
- Prevent from saving a non-existing skin path in user prefs (#1486936)
- Improve handling of single-part messages with bogus BODYSTRUCTURE (#1486898)
diff --git a/program/include/rcmail.php b/program/include/rcmail.php
index f0cbdbf..9fe9430 100644
--- a/program/include/rcmail.php
+++ b/program/include/rcmail.php
@@ -611,10 +611,6 @@
if ($virtuser = rcube_user::email2user($username))
$username = $virtuser;
- // lowercase username if it's an e-mail address (#1484473)
- if (strpos($username, '@'))
- $username = mb_strtolower($username);
-
// user already registered -> overwrite username
if ($user = rcube_user::query($username, $host))
$username = $user->data['username'];
@@ -622,8 +618,16 @@
if (!$this->imap)
$this->imap_init();
+ // try IMAP login
+ if (!($imap_login = $this->imap->connect($host, $username, $pass, $imap_port, $imap_ssl))) {
+ // lowercase username if it's an e-mail address (#1484473)
+ $username_lc = mb_strtolower($username);
+ if ($username_lc != $username && ($imap_login = $this->imap->connect($host, $username_lc, $pass, $imap_port, $imap_ssl)))
+ $username = $username_lc;
+ }
+
// exit if IMAP login failed
- if (!($imap_login = $this->imap->connect($host, $username, $pass, $imap_port, $imap_ssl)))
+ if (!$imap_login)
return false;
$this->set_imap_prop();
@@ -646,7 +650,7 @@
else {
raise_error(array(
'code' => 600, 'type' => 'php',
- 'file' => __FILE__, 'line' => __LINE__,
+ 'file' => __FILE__, 'line' => __LINE__,
'message' => "Failed to create a user record. Maybe aborted by a plugin?"
), true, false);
}
diff --git a/tests/modcss.php b/tests/modcss.php
index f9271ff..3ff5c48 100644
--- a/tests/modcss.php
+++ b/tests/modcss.php
@@ -18,7 +18,7 @@
$css = file_get_contents(TESTS_DIR . 'src/valid.css');
$mod = rcmail_mod_css_styles($css, 'rcmbody');
- $this->assertPattern('/#rcmbody div.rcmBody\s+\{/', $mod, "Replace body style definition");
+ $this->assertPattern('/#rcmbody\s+\{/', $mod, "Replace body style definition");
$this->assertPattern('/#rcmbody h1\s\{/', $mod, "Prefix tag styles (single)");
$this->assertPattern('/#rcmbody h1, #rcmbody h2, #rcmbody h3, #rcmbody textarea\s+\{/', $mod, "Prefix tag styles (multiple)");
$this->assertPattern('/#rcmbody \.noscript\s+\{/', $mod, "Prefix class styles");
--
Gitblit v1.9.1