Only lower-case user name if first login attempt failed (#1486393) + fix test

release-0.6
thomascube 14 years ago
parent 8603bbba2e
commit 6d94ab311a

@ -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)

@ -611,10 +611,6 @@ class rcmail
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 @@ class rcmail
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();

@ -18,7 +18,7 @@ class rcube_test_modcss extends UnitTestCase
$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");

Loading…
Cancel
Save