From bba657e64ff3334ba2f64e88e977a6dc107d682d Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Fri, 19 Sep 2008 14:26:34 -0400
Subject: [PATCH] Made config files location configurable (#1485215)

---
 installer/rcube_install.php |   67 +++++++++++++++++++++++++--------
 1 files changed, 51 insertions(+), 16 deletions(-)

diff --git a/installer/rcube_install.php b/installer/rcube_install.php
index e02ee75..e528cfc 100644
--- a/installer/rcube_install.php
+++ b/installer/rcube_install.php
@@ -24,6 +24,7 @@
 class rcube_install
 {
   var $step;
+  var $is_post = false;
   var $failures = 0;
   var $config = array();
   var $configured = false;
@@ -37,6 +38,7 @@
   function rcube_install()
   {
     $this->step = intval($_REQUEST['_step']);
+    $this->is_post = $_SERVER['REQUEST_METHOD'] == 'POST';
   }
   
   /**
@@ -77,12 +79,12 @@
    */
   function _load_config($suffix)
   {
-    include '../config/main.inc' . $suffix;
+    @include RCMAIL_CONFIG_DIR . '/main.inc' . $suffix;
     if (is_array($rcmail_config)) {
       $this->config += $rcmail_config;
     }
       
-    @include '../config/db.inc'. $suffix;
+    @include RCMAIL_CONFIG_DIR . '/db.inc'. $suffix;
     if (is_array($rcmail_config)) {
       $this->config += $rcmail_config;
     }
@@ -98,10 +100,10 @@
    */
   function getprop($name, $default = '')
   {
-    $value = $_SERVER['REQUEST_METHOD'] == 'POST' ? $_POST["_$name"] : $this->config[$name];
+    $value = $this->config[$name];
     
-    if ($name == 'des_key' && !isset($_REQUEST["_$name"]))
-      $value = self::random_key(24);
+    if ($name == 'des_key' && !$this->configured && !isset($_REQUEST["_$name"]))
+      $value = rcube_install::random_key(24);
     
     return $value !== null && $value !== '' ? $value : $default;
   }
@@ -120,27 +122,36 @@
     
     if (!$out)
       return '[Warning: could not read the template file]';
-    
+
     foreach ($this->config as $prop => $default) {
       $value = (isset($_POST["_$prop"]) || $this->config_props[$prop]) ? $_POST["_$prop"] : $default;
       
       // convert some form data
-      if ($prop == 'debug_level' && is_array($value)) {
+      if ($prop == 'debug_level') {
         $val = 0;
-        foreach ($value as $i => $dbgval)
-          $val += intval($dbgval);
-        $value = $val;
+        if (isset($value))
+	  foreach ($value as $dbgval)
+            $val += intval($dbgval);
+	$value = $val;
       }
-      else if ($prop == 'db_dsnw' && !empty($_POST['_dbtype'])) {
-        $value = sprintf('%s://%s:%s@%s/%s', $_POST['_dbtype'], $_POST['_dbuser'], $_POST['_dbpass'], $_POST['_dbhost'], $_POST['_dbname']);
+      else if ($which == 'db' && $prop == 'db_dsnw' && !empty($_POST['_dbtype'])) {
+        if ($_POST['_dbtype'] == 'sqlite')
+          $value = sprintf('%s://%s?mode=0646', $_POST['_dbtype'], $_POST['_dbname']{0} == '/' ? '/' . $_POST['_dbname'] : $_POST['_dbname']);
+        else
+          $value = sprintf('%s://%s:%s@%s/%s', $_POST['_dbtype'], 
+		    rawurlencode($_POST['_dbuser']), rawurlencode($_POST['_dbpass']),
+		    $_POST['_dbhost'], $_POST['_dbname']);
       }
       else if ($prop == 'smtp_auth_type' && $value == '0') {
         $value = '';
       }
       else if ($prop == 'default_host' && is_array($value)) {
-        $value = self::_clean_array($value);
+        $value = rcube_install::_clean_array($value);
         if (count($value) <= 1)
           $value = $value[0];
+      }
+      else if ($prop == 'pagesize') {
+        $value = max(2, intval($value));
       }
       else if ($prop == 'smtp_user' && !empty($_POST['_smtp_user_u'])) {
         $value = '%u';
@@ -158,15 +169,18 @@
       // skip this property
       if ($value == $default)
         continue;
-      
+
+      // save change
+      $this->config[$prop] = $value;
+
       // replace the matching line in config file
       $out = preg_replace(
         '/(\$rcmail_config\[\''.preg_quote($prop).'\'\])\s+=\s+(.+);/Uie',
         "'\\1 = ' . var_export(\$value, true) . ';'",
         $out);
     }
-    
-    return $out;
+
+    return trim($out);
   }
   
   
@@ -178,6 +192,25 @@
   function get_error()
   {
       return $this->last_error['message'];
+  }
+  
+  
+  /**
+   * 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;
   }
   
   
@@ -281,6 +314,8 @@
         if (eregi(';$', trim($line))) {
           $DB->query($buff);
           $buff = '';
+          if ($this->get_error())
+            break;
         }
       }
     }

--
Gitblit v1.9.1