Changeset 6d94ab3 in github

Timestamp:

Sep 26, 2010 11:06:55 AM (3 years ago)

Author:

thomascube <thomas@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

a8e1095

Parents:

8603bbb

Message:

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

Files:

• CHANGELOG (modified) (1 diff)
• program/include/rcmail.php (modified) (3 diffs)
• tests/modcss.php (modified) (1 diff)

CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- 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)

program/include/rcmail.php

@@ -612 +612 @@
         $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))
@@ -623 +619 @@
       $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;
 
@@ -647 +651 @@
         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);

tests/modcss.php

@@ -19 +19 @@
     $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)");