diff options
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | program/include/rcmail.php | 7 |
2 files changed, 5 insertions, 3 deletions
@@ -1,6 +1,7 @@ CHANGELOG Roundcube Webmail =========================== +- Fix host autoselection when default_host is an array (#1488495) - Move messages forwarding mode setting into Preferences - Add is_escaped attribute for html_select and html_textarea (#1488485) - Fix HTML entities handling in HTML editor (#1488483) diff --git a/program/include/rcmail.php b/program/include/rcmail.php index 4dba0e1cf..a10a2aa72 100644 --- a/program/include/rcmail.php +++ b/program/include/rcmail.php @@ -546,15 +546,16 @@ class rcmail extends rcube if (is_array($default_host)) { $post_host = rcube_utils::get_input_value('_host', rcube_utils::INPUT_POST); + $post_user = rcube_utils::get_input_value('_user', rcube_utils::INPUT_POST); + + list($user, $domain) = explode('@', $post_user); // direct match in default_host array if ($default_host[$post_host] || in_array($post_host, array_values($default_host))) { $host = $post_host; } - // try to select host by mail domain - list($user, $domain) = explode('@', rcube_utils::get_input_value('_user', rcube_utils::INPUT_POST)); - if (!empty($domain)) { + else if (!empty($domain)) { foreach ($default_host as $storage_host => $mail_domains) { if (is_array($mail_domains) && in_array_nocase($domain, $mail_domains)) { $host = $storage_host; |