diff --git a/INSTALL b/INSTALL
index 8d898a9df..f40bb1f11 100644
--- a/INSTALL
+++ b/INSTALL
@@ -35,10 +35,9 @@ INSTALLATION
- /temp
- /logs
3. Create a new database and a database user for RoundCube (see DATABASE SETUP)
-4. Create database tables using the queries in file 'SQL/*.initial.sql'
- (* stands for your database type)
-5. Rename the files config/*.inc.php.dist to config/*.inc.php
-6. Modify the files in config/* to suit your local environment
+4. Point your browser to http:///url-to-roundcube/installer/
+5. Follow the instructions of the install script (or see MANUAL CONFINGURATION)
+6. After creating and testing the configuration, remove the installer directory
7. Done!
@@ -109,12 +108,13 @@ versions don't have a -O option for the createdb, so if you are
using that version you'll have to change ownership of the DB later.
-CONFIGURATION
-=============
+MANUAL CONFIGURATION
+====================
First of all, rename the files config/*.inc.php.dist to config/*.inc.php.
You can then change these files according to your environment and your needs.
Details about the config parameters can be found in the config files.
+See http://trac.roundcube.net/wiki/Howto_Install for even more guidance.
You can also modify the default .htaccess file. This is necessary to
increase the allowed size of file attachments, for example:
diff --git a/installer/config.php b/installer/config.php
index 63031b6b1..0697cc124 100644
--- a/installer/config.php
+++ b/installer/config.php
@@ -5,7 +5,7 @@
ini_set('display_errors', 1);
require_once 'include/rcube_html.inc';
-$RCI->get_defaults();
+$RCI->load_defaults();
if (!empty($_POST['submit'])) {
diff --git a/installer/rcube_install.php b/installer/rcube_install.php
index 136fdd006..f2ab394a1 100644
--- a/installer/rcube_install.php
+++ b/installer/rcube_install.php
@@ -52,7 +52,7 @@ class rcube_install
/**
* Read the default config files and store properties
*/
- function get_defaults()
+ function load_defaults()
{
$this->_load_config('.php.dist');
}
@@ -74,7 +74,7 @@ class rcube_install
{
include '../config/main.inc' . $suffix;
if (is_array($rcmail_config)) {
- $this->config = $rcmail_config;
+ $this->config += $rcmail_config;
}
@include '../config/db.inc'. $suffix;
@@ -238,6 +238,56 @@ class rcube_install
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
*/
diff --git a/installer/styles.css b/installer/styles.css
index de4a9ca4d..1290696f8 100644
--- a/installer/styles.css
+++ b/installer/styles.css
@@ -123,7 +123,7 @@ textarea.configfile {
font-family: monospace;
font-size: 9pt;
width: 100%;
- height: 40em;
+ height: 30em;
}
dt.propname {
diff --git a/installer/test.php b/installer/test.php
index 783cf3c1b..b782a5c44 100644
--- a/installer/test.php
+++ b/installer/test.php
@@ -49,12 +49,14 @@ if (!empty($RCI->config)) {
$DB->db_connect('w');
if (!($db_error_msg = $DB->is_error())) {
$RCI->pass('DSN (write)');
+ echo '
';
$db_working = true;
}
else {
- $RCI->fail('DSN (write)', "Error: $db_error_msg");
+ $RCI->fail('DSN (write)', $db_error_msg);
+ echo '
Make sure that the configured database extists and that the user as write privileges
';
+ echo 'DSN: ' . $RCI->config['db_dsnw'] . '
Please try to inizialize the database manually as described in the INSTALL guide.
'; - echo 'Please try to inizialize the database manually as described in the INSTALL guide. + Make sure that the configured database extists and that the user as write privileges
'; } } +// test database if ($db_working) { - $success = $DB->query("SELECT count(*) FROM {$RCI->config['db_table_users']}"); - if (!$success) { + $db_read = $DB->query("SELECT count(*) FROM {$RCI->config['db_table_users']}"); + if (!$db_read) { $RCI->fail('DB Schema', "Database not initialized"); + $db_working = false; echo ''; } else { $RCI->pass('DB Schema'); } echo '[@todo Add tests for IMAP and SMTP settings]