From f3e1010090c0b3dbcbf04c6ad356a610637ba2a9 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Wed, 21 Apr 2010 06:30:47 -0400
Subject: [PATCH] - Hide IMAP host dropdown when single host is defined (#1486326)
---
CHANGELOG | 1 +
program/include/rcube_template.php | 15 ++++++++++++---
2 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 09d715f..46224fa 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
CHANGELOG RoundCube Webmail
===========================
+- Hide IMAP host dropdown when single host is defined (#1486326)
- Add images pre-loading on login page (#1451160)
- Add HTTP_X_REAL_IP and HTTP_X_FORWARDED_FOR to successful logins log (#1486441)
- Fix setting spellcheck languages with extended codes (#1486605)
diff --git a/program/include/rcube_template.php b/program/include/rcube_template.php
index c622380..8b8f7a9 100755
--- a/program/include/rcube_template.php
+++ b/program/include/rcube_template.php
@@ -1024,7 +1024,7 @@
$input_url = new html_hiddenfield(array('name' => '_url', 'id' => 'rcmloginurl', 'value' => $url));
$input_host = null;
- if (is_array($default_host)) {
+ if (is_array($default_host) && count($default_host) > 1) {
$input_host = new html_select(array('name' => '_host', 'id' => 'rcmloginhost'));
foreach ($default_host as $key => $value) {
@@ -1036,6 +1036,11 @@
break;
}
}
+ }
+ else if (is_array($default_host) && ($host = array_pop($default_host))) {
+ $hide_host = true;
+ $input_host = new html_hiddenfield(array(
+ 'name' => '_host', 'id' => 'rcmloginhost', 'value' => $host) + $attrib);
}
else if (empty($default_host)) {
$input_host = new html_inputfield(array('name' => '_host', 'id' => 'rcmloginhost') + $attrib);
@@ -1054,7 +1059,7 @@
$table->add(null, $input_pass->show());
// add host selection row
- if (is_object($input_host)) {
+ if (is_object($input_host) && !$hide_host) {
$table->add('title', html::label('rcmloginhost', Q(rcube_label('server'))));
$table->add(null, $input_host->show(get_input_value('_host', RCUBE_INPUT_POST)));
}
@@ -1063,10 +1068,14 @@
$out .= $input_tzone->show();
$out .= $input_url->show();
$out .= $table->show();
+
+ if ($hide_host) {
+ $out .= $input_host->show();
+ }
// surround html output with a form tag
if (empty($attrib['form'])) {
- $out = $this->form_tag(array('name' => $form_name, 'method' => "post"), $out);
+ $out = $this->form_tag(array('name' => $form_name, 'method' => 'post'), $out);
}
return $out;
--
Gitblit v1.9.1