From 112c54ffbbfd65d2d76ce2526b77407f7fb067b8 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Thu, 28 Feb 2008 22:59:02 +0000
Subject: Fix imap host selection in install script

---
 installer/rcube_install.php | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

(limited to 'installer/rcube_install.php')

diff --git a/installer/rcube_install.php b/installer/rcube_install.php
index e02ee75ad..35054a19e 100644
--- a/installer/rcube_install.php
+++ b/installer/rcube_install.php
@@ -98,7 +98,8 @@ class rcube_install
    */
   function getprop($name, $default = '')
   {
-    $value = $_SERVER['REQUEST_METHOD'] == 'POST' ? $_POST["_$name"] : $this->config[$name];
+    $value = $_SERVER['REQUEST_METHOD'] == 'POST' &&
+              (isset($_POST["_$name"]) || $this->config_props[$name]) ? $_POST["_$name"] : $this->config[$name];
     
     if ($name == 'des_key' && !isset($_REQUEST["_$name"]))
       $value = self::random_key(24);
@@ -181,6 +182,25 @@ class rcube_install
   }
   
   
+  /**
+   * Return a list with all imap hosts configured
+   *
+   * @return array Clean list with imap hosts
+   */
+  function get_hostlist()
+  {
+    $default_hosts = (array)$this->getprop('default_host');
+    $out = array();
+    
+    foreach ($default_hosts as $key => $name) {
+      if (!empty($name))
+        $out[] = is_numeric($key) ? $name : $key;
+    }
+    
+    return $out;
+  }
+  
+  
   /**
    * Display OK status
    *
-- 
cgit v1.2.3