X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=installer%2Ftest.php;h=d66fe34f24381531ee42287890d4745d100abff9;hb=3adad46e27086084a8b28a32fc4fbc953dbfef6c;hp=bdaf3ee525ef424df16ad4a44691bb26b45222af;hpb=48e8459231a1efa3e97284d07a328776a5b7485b;p=roundcube.git
diff --git a/installer/test.php b/installer/test.php
index bdaf3ee..d66fe34 100644
--- a/installer/test.php
+++ b/installer/test.php
@@ -3,8 +3,8 @@
Check config files
config)) {
$RCI->pass('main.inc.php');
@@ -27,6 +27,64 @@ else if (!$read_db) {
$RCI->fail('db.inc.php', 'Unable to read file. Did you create the config files?');
}
+if ($RCI->configured && ($messages = $RCI->check_config())) {
+
+ if (is_array($messages['missing'])) {
+ echo 'Missing config options ';
+ echo 'The following config options are not present in the current configuration. ';
+ echo 'Please check the default config files and add the missing properties to your local config files.
';
+
+ echo '';
+ foreach ($messages['missing'] as $msg) {
+ echo html::tag('li', null, html::span('propname', $msg['prop']) . ($msg['name'] ? ': ' . $msg['name'] : ''));
+ }
+ echo ' ';
+ }
+
+ if (is_array($messages['replaced'])) {
+ echo 'Replaced config options ';
+ echo 'The following config options have been replaced or renamed. ';
+ echo 'Please update them accordingly in your config files.
';
+
+ echo '';
+ foreach ($messages['replaced'] as $msg) {
+ echo html::tag('li', null, html::span('propname', $msg['prop']) .
+ ' was replaced by ' . html::span('propname', $msg['replacement']));
+ }
+ echo ' ';
+ }
+
+ if (is_array($messages['obsolete'])) {
+ echo 'Obsolete config options ';
+ echo 'You still have some obsolete or inexistent properties set. This isn\'t a problem but should be noticed.
';
+
+ echo '';
+ foreach ($messages['obsolete'] as $msg) {
+ echo html::tag('li', null, html::span('propname', $msg['prop']) . ($msg['name'] ? ': ' . $msg['name'] : ''));
+ }
+ echo ' ';
+ }
+
+ echo 'OK, lazy people can download the updated config files here: ';
+ echo html::a(array('href' => './?_mergeconfig=main'), 'main.inc.php') . ' ';
+ echo html::a(array('href' => './?_mergeconfig=db'), 'db.inc.php');
+ echo "
";
+
+
+ if (is_array($messages['dependencies'])) {
+ echo 'Dependency check failed ';
+ echo 'Some of your configuration settings require other options to be configured or additional PHP modules to be installed
';
+
+ echo '';
+ foreach ($messages['dependencies'] as $msg) {
+ echo html::tag('li', null, html::span('propname', $msg['prop']) . ': ' . $msg['explain']);
+ }
+ echo ' ';
+ }
+
+
+}
+
?>
Check if directories are writable
@@ -35,7 +93,12 @@ else if (!$read_db) {
if ($RCI->configured) {
$pass = false;
- foreach (array($RCI->config['temp_dir'],$RCI->config['log_dir']) as $dir) {
+
+ $dirs[] = $RCI->config['temp_dir'];
+ if($RCI->config['log_driver'] != 'syslog')
+ $dirs[] = $RCI->config['log_dir'];
+
+ foreach ($dirs as $dir) {
$dirpath = $dir{0} == '/' ? $dir : INSTALL_PATH . $dir;
if (is_writable(realpath($dirpath))) {
$RCI->pass($dir);
@@ -61,14 +124,9 @@ else {
$db_working = false;
if ($RCI->configured) {
- if (!empty($RCI->config['db_backend']) && !empty($RCI->config['db_dsnw'])) {
-
- echo 'Backend: ';
- echo 'PEAR::' . strtoupper($RCI->config['db_backend']) . ' ';
+ if (!empty($RCI->config['db_dsnw'])) {
- $dbclass = 'rcube_' . strtolower($RCI->config['db_backend']);
-
- $DB = new $dbclass($RCI->config['db_dsnw'], '', false);
+ $DB = new rcube_mdb2($RCI->config['db_dsnw'], '', false);
$DB->db_connect('w');
if (!($db_error_msg = $DB->is_error())) {
$RCI->pass('DSN (write)');
@@ -79,8 +137,6 @@ if ($RCI->configured) {
$RCI->fail('DSN (write)', $db_error_msg);
echo 'Make sure that the configured database exists and that the user has write privileges ';
echo 'DSN: ' . $RCI->config['db_dsnw'] . '
';
- if ($RCI->config['db_backend'] == 'mdb2')
- echo 'There are known problems with MDB2 running on PHP 4. Try setting db_backend to \'db\' instead
';
}
}
else {
@@ -105,13 +161,22 @@ if ($db_working) {
$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 '
';
+ $db_working = false;
+ }
+ /*
+ else if (!$RCI->db_schema_check($update = !empty($_POST['updatedb']))) {
+ $RCI->fail('DB Schema', "Database schema differs");
+
+ echo $update ? 'Failed to update the database schema! Please manually execute the SQL statements from the SQL/*.update.sql file on your database
' :
+ '
';
+ $db_working = false;
}
+ */
else {
$RCI->pass('DB Schema');
+ echo ' ';
}
- echo ' ';
}
// more database tests
@@ -127,7 +192,7 @@ if ($db_working) {
else {
$RCI->fail('DB Write', $RCI->get_error());
}
- echo ' ';
+ echo ' ';
// check timezone settings
$tz_db = 'SELECT ' . $DB->unixtimestamp($DB->now()) . ' AS tz_db';
@@ -239,10 +304,10 @@ if (isset($_POST['sendmail']) && !empty($_POST['_from']) && !empty($_POST['_to']
else {
$RCI->fail('SMTP send', 'Invalid sender or recipient');
}
+
+ echo '';
}
-echo '';
-
?>