- Fix %h/%z variables in username_domain option (#1487701)

This commit is contained in:
alecpl
2011-01-17 12:21:08 +00:00
parent 68d2d54100
commit a76cbddfc9
3 changed files with 6 additions and 4 deletions

View File

@@ -674,9 +674,9 @@ class rcmail
// Check if we need to add domain
if (!empty($config['username_domain']) && strpos($username, '@') === false) {
if (is_array($config['username_domain']) && isset($config['username_domain'][$host]))
$username .= '@'.rcube_parse_host($config['username_domain'][$host]);
$username .= '@'.rcube_parse_host($config['username_domain'][$host], $host);
else if (is_string($config['username_domain']))
$username .= '@'.rcube_parse_host($config['username_domain']);
$username .= '@'.rcube_parse_host($config['username_domain'], $host);
}
// Convert username to lowercase. If IMAP backend