diff options
author | Thomas Bruederli <thomas@roundcube.net> | 2013-06-28 22:27:59 +0200 |
---|---|---|
committer | Thomas Bruederli <thomas@roundcube.net> | 2013-06-28 22:27:59 +0200 |
commit | 9bacb2cd3f7e8f96a29f651460954965c400aac6 (patch) | |
tree | 73ce71706da010ef337b23fd53afc296e4675f17 /installer/index.php | |
parent | 0f39b4f4cdd60f4af5f85d656ed08698e86287ea (diff) |
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
Diffstat (limited to 'installer/index.php')
-rw-r--r-- | installer/index.php | 12 |
1 files changed, 10 insertions, 2 deletions
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 '<h2 class="error">The installer is disabled!</h2>'; - echo '<p>To enable it again, set <tt>$rcmail_config[\'enable_installer\'] = true;</tt> in RCUBE_CONFIG_DIR/config.inc.php</p>'; + if ($RCI->configured && $RCI->legacy_config) { + echo '<h2 class="error">Your configuration needs to be migrated!</h2>'; + echo '<p>We changed the configuration files structure and your installation needs to be updated accordingly.</p>'; + echo '<p>Please run the <tt>bin/update.sh</tt> script from the command line or set <p> <tt>$rcmail_config[\'enable_installer\'] = true;</tt></p>'; + echo ' in your RCUBE_CONFIG_DIR/main.inc.php to let the installer help you migrating it.</p>'; + } + else { + echo '<h2 class="error">The installer is disabled!</h2>'; + echo '<p>To enable it again, set <tt>$rcmail_config[\'enable_installer\'] = true;</tt> in RCUBE_CONFIG_DIR/config.inc.php</p>'; + } echo '</div></body></html>'; exit; } |