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 | 135 ++++++++++++++++++++++++++++++++++++++-------
1 files changed, 114 insertions(+), 21 deletions(-)
diff --git a/installer/rcube_install.php b/installer/rcube_install.php
index 136fdd0..37645ad 100644
--- a/installer/rcube_install.php
+++ b/installer/rcube_install.php
@@ -24,9 +24,13 @@
class rcube_install
{
var $step;
+ var $is_post = false;
var $failures = 0;
var $config = array();
+ var $configured = false;
var $last_error = null;
+ var $email_pattern = '([a-z0-9][a-z0-9\-\.\+\_]*@[a-z0-9]([a-z0-9\-][.]?)*[a-z0-9])';
+ var $config_props = array();
/**
* Constructor
@@ -34,6 +38,7 @@
function rcube_install()
{
$this->step = intval($_REQUEST['_step']);
+ $this->is_post = $_SERVER['REQUEST_METHOD'] == 'POST';
}
/**
@@ -52,7 +57,7 @@
/**
* Read the default config files and store properties
*/
- function get_defaults()
+ function load_defaults()
{
$this->_load_config('.php.dist');
}
@@ -63,7 +68,9 @@
*/
function load_config()
{
+ $this->config = array();
$this->_load_config('.php');
+ $this->configured = !empty($this->config);
}
/**
@@ -72,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;
+ $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;
}
@@ -88,16 +95,17 @@
* Getter for a certain config property
*
* @param string Property name
+ * @param string Default value
* @return string The property value
*/
- function getprop($name)
+ function getprop($name, $default = '')
{
- $value = isset($_REQUEST["_$name"]) ? $_REQUEST["_$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;
+ return $value !== null && $value !== '' ? $value : $default;
}
@@ -114,27 +122,35 @@
if (!$out)
return '[Warning: could not read the template file]';
-
+
foreach ($this->config as $prop => $default) {
- $value = $_POST["_$prop"] ? $_POST["_$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'])) {
- $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';
@@ -143,21 +159,27 @@
$value = '%p';
}
else if (is_bool($default)) {
- $value = is_numeric($value) ? (bool)$value : $value;
+ $value = (bool)$value;
+ }
+ else if (is_numeric($value)) {
+ $value = intval($value);
}
// 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);
}
@@ -169,6 +191,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;
}
@@ -238,6 +279,58 @@
return $out;
}
+
+ /**
+ * Initialize the database with the according schema
+ *
+ * @param object rcube_db Database connection
+ * @return boolen True on success, False on error
+ */
+ function init_db($DB)
+ {
+ $db_map = array('pgsql' => 'postgres', 'mysqli' => 'mysql');
+ $engine = isset($db_map[$DB->db_provider]) ? $db_map[$DB->db_provider] : $DB->db_provider;
+
+ // find out db version
+ if ($engine == 'mysql') {
+ $DB->query('SELECT VERSION() AS version');
+ $sql_arr = $DB->fetch_assoc();
+ $version = floatval($sql_arr['version']);
+
+ if ($version >= 4.1)
+ $engine = 'mysql5';
+ }
+
+ // read schema file from /SQL/*
+ $fname = "../SQL/$engine.initial.sql";
+ if ($lines = @file($fname, FILE_SKIP_EMPTY_LINES)) {
+ $buff = '';
+ foreach ($lines as $i => $line) {
+ if (eregi('^--', $line))
+ continue;
+
+ $buff .= $line . "\n";
+ if (eregi(';$', trim($line))) {
+ $DB->query($buff);
+ $buff = '';
+ if ($this->get_error())
+ break;
+ }
+ }
+ }
+ else {
+ $this->fail('DB Schema', "Cannot read the schema file: $fname");
+ return false;
+ }
+
+ if ($err = $this->get_error()) {
+ $this->fail('DB Schema', "Error creating database schema: $err");
+ return false;
+ }
+
+ return true;
+ }
+
/**
* Handler for RoundCube errors
*/
--
Gitblit v1.9.1