From 942069969cfd95784f872b3bef2cc6323fc55c3d Mon Sep 17 00:00:00 2001 From: alecpl Date: Fri, 10 Apr 2009 09:26:56 +0000 Subject: - Support several e-mail addresses per user from virtuser_file (#1485678) - return NULL from rcube_user::email2user if user not found (#1485801) --- program/include/rcmail.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'program/include/rcmail.php') diff --git a/program/include/rcmail.php b/program/include/rcmail.php index f109c16fd..71601b526 100644 --- a/program/include/rcmail.php +++ b/program/include/rcmail.php @@ -453,9 +453,10 @@ class rcmail $username .= '@'.$config['username_domain']; } - // try to resolve email address from virtuser table - if (!empty($config['virtuser_file']) && strpos($username, '@')) - $username = rcube_user::email2user($username); + // try to resolve email address from virtuser table + if (strpos($username, '@')) + if ($virtuser = rcube_user::email2user($username)) + $username = $virtuser; // lowercase username if it's an e-mail address (#1484473) if (strpos($username, '@')) -- cgit v1.2.3