From bf2f39ea6d2b49c7495a43cca19ab18f27f8292e Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Mon, 29 Sep 2008 09:02:02 -0400
Subject: [PATCH] - #1485290: Fix unread counter when displaying cached massage in preview panel - remove some empty lines in app.js

---
 installer/rcube_install.php |   40 +++++++++++++++++++++++++---------------
 1 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/installer/rcube_install.php b/installer/rcube_install.php
index 79d003c..37645ad 100644
--- a/installer/rcube_install.php
+++ b/installer/rcube_install.php
@@ -79,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;
     }
@@ -100,10 +100,10 @@
    */
   function getprop($name, $default = '')
   {
-    $value = $this->is_post && (isset($_POST["_$name"]) || $this->config_props[$name]) ? $_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;
   }
@@ -122,30 +122,35 @@
     
     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);
+        if (is_array($value))
+          foreach ($value as $dbgval)
+            $val += intval($dbgval);
         $value = $val;
       }
-      else if ($prop == 'db_dsnw' && !empty($_POST['_dbtype'])) {
+      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'], $_POST['_dbuser'], $_POST['_dbpass'], $_POST['_dbhost'], $_POST['_dbname']);
+          $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';
@@ -163,15 +168,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);
   }
   
   
@@ -305,6 +313,8 @@
         if (eregi(';$', trim($line))) {
           $DB->query($buff);
           $buff = '';
+          if ($this->get_error())
+            break;
         }
       }
     }

--
Gitblit v1.9.1