From 9bacb2cd3f7e8f96a29f651460954965c400aac6 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli
Date: Fri, 28 Jun 2013 22:27:59 +0200
Subject: Prepare config migration: - Show warning in installer and hints how
to migrate - Let update.sh create the new config file if legacy config is
detected - Provide a sample config file for manual configuration - Define a
list of options which always should be written to local config
---
installer/index.php | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
(limited to 'installer/index.php')
diff --git a/installer/index.php b/installer/index.php
index 4e4a04326..dc4c0a43f 100644
--- a/installer/index.php
+++ b/installer/index.php
@@ -121,8 +121,16 @@ if ($RCI->configured && empty($_REQUEST['_step'])) {
// exit if installation is complete
if ($RCI->configured && !$RCI->getprop('enable_installer') && !$_SESSION['allowinstaller']) {
// header("HTTP/1.0 404 Not Found");
- echo 'The installer is disabled!
';
- echo 'To enable it again, set $rcmail_config[\'enable_installer\'] = true; in RCUBE_CONFIG_DIR/config.inc.php
';
+ if ($RCI->configured && $RCI->legacy_config) {
+ echo 'Your configuration needs to be migrated!
';
+ echo 'We changed the configuration files structure and your installation needs to be updated accordingly.
';
+ echo 'Please run the bin/update.sh script from the command line or set
$rcmail_config[\'enable_installer\'] = true;
';
+ echo ' in your RCUBE_CONFIG_DIR/main.inc.php to let the installer help you migrating it.
';
+ }
+ else {
+ echo 'The installer is disabled!
';
+ echo 'To enable it again, set $rcmail_config[\'enable_installer\'] = true; in RCUBE_CONFIG_DIR/config.inc.php
';
+ }
echo '