From fd6b193c6e072339b5012945aae8b6aa2c0f95b7 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli The config file was saved successfully into '.RCMAIL_CONFIG_DIR.' directory of your Roundcube installation.';
- if($RCI->legacy_config) {
+ if ($RCI->legacy_config) {
echo ' Copy or download the following configuration and save it';
- echo ' as config.inc.php within the '.RCUBE_CONFIG_DIR.' directory of your Roundcube installation. Copy or download the following configuration and save it';
+ echo ' as config.inc.php within the '.RCUBE_CONFIG_DIR.' directory of your Roundcube installation.
Afterwards, please remove the old configuration files main.inc.php and db.inc.php from the config directory.';
}
echo '
';
- echo ' Make sure that there are no characters outside the <?php ?> brackets when saving the file.';
- echo ' ';
-
- if($RCI->legacy_config) {
- echo '
Afterwards, please remove the old configuration files main.inc.php and db.inc.php from the config directory.';
- }
+ else {
+ echo '
';
+ echo ' Make sure that there are no characters outside the <?php ?> brackets when saving the file.';
+ echo ' ';
+
+ if ($RCI->legacy_config) {
+ echo '
Afterwards, please remove the old configuration files main.inc.php and db.inc.php from the config directory.';
+ }
- echo '
Of course there are more options to configure. diff --git a/installer/rcube_install.php b/installer/rcube_install.php index 76d6a7f10..9c9794cc2 100644 --- a/installer/rcube_install.php +++ b/installer/rcube_install.php @@ -277,14 +277,13 @@ class rcube_install * * @return boolean True if the file was saved successfully, false if not */ - function save_configfile() + function save_configfile($config) { - if(is_writable(RCUBE_CONFIG_DIR)) - { - return file_put_contents(RCUBE_CONFIG_DIR . 'config.inc.php', $_SESSION['config']); - } + if (is_writable(RCUBE_CONFIG_DIR)) { + return file_put_contents(RCUBE_CONFIG_DIR . 'config.inc.php', $config); + } - return false; + return false; } /** -- cgit v1.2.3