Changeset 532844b in github

Timestamp:

Sep 11, 2007 5:53:41 AM (6 years ago)

Author:

thomascube <thomas@…>

Branches:

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

Children:

63749a1

Parents:

4845a1e

Message:

Resolve username from virtuser file before looking up in database

File:

• program/include/main.inc (modified) (3 diffs)

program/include/main.inc

@@ -581 +581 @@
     }
 
+  // try to resolve email address from virtuser table    
+  if (!empty($CONFIG['virtuser_file']) && strpos($user, '@'))
+    $user = rcmail_email2user($user);
+
   // lowercase username if it's an e-mail address (#1484473)
   if (strpos($user, '@'))
@@ -586 +590 @@
 
   // query if user already registered
-  $sql_result = $DB->query("SELECT user_id, username, language, preferences
-                            FROM ".get_table_name('users')."
-                            WHERE  mail_host=? AND (username=? OR alias=?)",
-                            $host,
-                            $user,
-                            $user);
+  $sql_result = $DB->query(
+    "SELECT user_id, username, language, preferences
+     FROM ".get_table_name('users')."
+     WHERE  mail_host=? AND (username=? OR alias=?)",
+    $host,
+    $user,
+    $user);
 
   // user already registered -> overwrite username
@@ -599 +604 @@
     $user = $sql_arr['username'];
     }
-
-  // try to resolve email address from virtuser table    
-  if (!empty($CONFIG['virtuser_file']) && strpos($user, '@'))
-    $user = rcmail_email2user($user);
-
 
   // exit if IMAP login failed