Fix login in case when default_host is an array with one element (#14…

…88928)
roundcube · Jan 24, 2013 · 6ff0c30 · 6ff0c30
1 parent 40917b0
commit 6ff0c30
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,6 +1,7 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+- Fix login in case when default_host is an array with one element (#1488928)
 - Use LDAP fallback hosts on connect + bind instead of ldap_connect() only.
 - Add config option for LDAP bind timeout (sets LDAP_OPT_NETWORK_TIMEOUT option)
 - Submit Addressbook advanced search form with Enter key (#1488568)

diff --git a/program/include/rcmail_output_html.php b/program/include/rcmail_output_html.php
@@ -1550,10 +1550,10 @@ protected function login_form($attrib)
                 }
             }
         }
-        else if (is_array($default_host) && ($host = array_pop($default_host))) {
+        else if (is_array($default_host) && ($host = key($default_host)) !== null) {
             $hide_host = true;
             $input_host = new html_hiddenfield(array(
-                'name' => '_host', 'id' => 'rcmloginhost', 'value' => $host) + $attrib);
+                'name' => '_host', 'id' => 'rcmloginhost', 'value' => is_numeric($host) ? $default_host[$host] : $host) + $attrib);
         }
         else if (empty($default_host)) {
             $input_host = new html_inputfield(array('name' => '_host', 'id' => 'rcmloginhost')