From 58670b2a9d88f9eb72b86ef458e679aedf42a1db Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Thu, 28 Feb 2008 15:04:12 -0500
Subject: [PATCH] Updated Slovak localization
---
installer/rcube_install.php | 180 +++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 161 insertions(+), 19 deletions(-)
diff --git a/installer/rcube_install.php b/installer/rcube_install.php
index 2e1df00..65fbe09 100644
--- a/installer/rcube_install.php
+++ b/installer/rcube_install.php
@@ -25,7 +25,10 @@
{
var $step;
var $failures = 0;
- var $defaults = array();
+ 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])';
/**
* Constructor
@@ -33,25 +36,54 @@
function rcube_install()
{
$this->step = intval($_REQUEST['_step']);
- $this->get_defaults();
}
+ /**
+ * Singleton getter
+ */
+ function get_instance()
+ {
+ static $inst;
+
+ if (!$inst)
+ $inst = new rcube_install();
+
+ return $inst;
+ }
/**
- * Read the default config file and store properties
+ * Read the default config files and store properties
*/
- function get_defaults()
+ function load_defaults()
{
- $suffix = is_readable('../config/main.inc.php.dist') ? '.dist' : '';
-
- include '../config/main.inc.php' . $suffix;
+ $this->_load_config('.php.dist');
+ }
+
+
+ /**
+ * Read the local config files and store properties
+ */
+ function load_config()
+ {
+ $this->config = array();
+ $this->_load_config('.php');
+ $this->configured = !empty($this->config);
+ }
+
+ /**
+ * Read the default config file and store properties
+ * @access private
+ */
+ function _load_config($suffix)
+ {
+ include '../config/main.inc' . $suffix;
if (is_array($rcmail_config)) {
- $this->defaults = $rcmail_config;
+ $this->config += $rcmail_config;
}
- include '../config/db.inc.php'. $suffix;
+ @include '../config/db.inc'. $suffix;
if (is_array($rcmail_config)) {
- $this->defaults += $rcmail_config;
+ $this->config += $rcmail_config;
}
}
@@ -60,16 +92,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->defaults[$name];
+ $value = isset($_REQUEST["_$name"]) ? $_REQUEST["_$name"] : $this->config[$name];
if ($name == 'des_key' && !isset($_REQUEST["_$name"]))
$value = self::random_key(24);
- return $value;
+ return $value !== null && $value !== '' ? $value : $default;
}
@@ -87,12 +120,8 @@
if (!$out)
return '[Warning: could not read the template file]';
- foreach ($this->defaults as $prop => $default) {
+ foreach ($this->config as $prop => $default) {
$value = $_POST["_$prop"] ? $_POST["_$prop"] : $default;
-
- // skip this property
- if (!isset($_POST["_$prop"]) || $value == $default)
- continue;
// convert some form data
if ($prop == 'debug_level' && is_array($value)) {
@@ -101,8 +130,30 @@
$val += intval($dbgval);
$value = $val;
}
- else if (is_bool($default))
+ 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 ($prop == 'smtp_auth_type' && $value == '0') {
+ $value = '';
+ }
+ else if ($prop == 'default_host' && is_array($value)) {
+ $value = self::_clean_array($value);
+ if (count($value) <= 1)
+ $value = $value[0];
+ }
+ else if ($prop == 'smtp_user' && !empty($_POST['_smtp_user_u'])) {
+ $value = '%u';
+ }
+ else if ($prop == 'smtp_pass' && !empty($_POST['_smtp_user_u'])) {
+ $value = '%p';
+ }
+ else if (is_bool($default)) {
$value = is_numeric($value) ? (bool)$value : $value;
+ }
+
+ // skip this property
+ if ($value == $default)
+ continue;
// replace the matching line in config file
$out = preg_replace(
@@ -112,6 +163,17 @@
}
return $out;
+ }
+
+
+ /**
+ * Getter for the last error message
+ *
+ * @return string Error message or null if none exists
+ */
+ function get_error()
+ {
+ return $this->last_error['message'];
}
@@ -170,6 +232,76 @@
}
+ function _clean_array($arr)
+ {
+ $out = array();
+
+ foreach (array_unique($arr) as $i => $val)
+ if (!empty($val))
+ $out[] = $val;
+
+ 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 = '';
+ }
+ }
+ }
+ 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
+ */
+ function raise_error($p)
+ {
+ $this->last_error = $p;
+ }
+
+
/**
* Generarte a ramdom string to be used as encryption key
*
@@ -202,3 +334,13 @@
return htmlentities($string);
}
+
+/**
+ * Fake rinternal error handler to catch errors
+ */
+function raise_error($p)
+{
+ $rci = rcube_install::get_instance();
+ $rci->raise_error($p);
+}
+
--
Gitblit v1.9.1