From 77d5349ef20a38ddd44c96fada3925f446381ddd Mon Sep 17 00:00:00 2001 From: Dennis1993 Date: Tue, 16 Jul 2013 17:30:37 +0200 Subject: Update config.php write config file automatically to RCUBE_CONFIG_DIR --- installer/config.php | 38 +++++++++++++++++++++++++++----------- 1 file changed, 27 insertions(+), 11 deletions(-) (limited to 'installer/config.php') diff --git a/installer/config.php b/installer/config.php index f990fc23f..ece48f578 100644 --- a/installer/config.php +++ b/installer/config.php @@ -24,21 +24,37 @@ $RCI->bool_config_props = array( $_SESSION['allowinstaller'] = true; if (!empty($_POST['submit'])) { - 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.
'; - 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'; - echo ' from the config directory.'; + $_SESSION['config'] = $RCI->create_config(); + + if($RCI->save_configfile()) + { + echo '

The config files was saved successfully into '.RCMAIL_CONFIG_DIR.' directory of your Roundcube installation.'; + + if($RCI->legacy_config) { + echo '

Afterwards, please remove the old configuration files main.inc.php and db.inc.php from the config directory.'; + } + + echo '

'; } - echo '

'; + else + { + 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.
'; + echo ' Make sure that there are no characters outside the <?php ?> brackets when saving the file.'; + echo ' '; - $textbox = new html_textarea(array('rows' => 16, 'cols' => 60, 'class' => "configfile")); - echo $textbox->show(($_SESSION['config'] = $RCI->create_config())); + if($RCI->legacy_config) { + echo '

Afterwards, please remove the old configuration files main.inc.php and db.inc.php from the config directory.'; + } + + echo '

'; + + $textbox = new html_textarea(array('rows' => 16, 'cols' => 60, 'class' => "configfile")); + echo $textbox->show(($_SESSION['config'])); + } echo '

Of course there are more options to configure. - Have a look at the defaults.inc.php file or visit Howto_Config to find out.

'; + Have a look at the defaults.inc.php file or visit Howto_Config to find out.

'; echo '

'; -- cgit v1.2.3 From 57a19745b977053a1d7bf1c62762b8d1c4a59175 Mon Sep 17 00:00:00 2001 From: Dennis1993 Date: Wed, 17 Jul 2013 10:24:49 +0200 Subject: Update config.php -Replace tabs with spaces. -Replace the word "files" with "files", because there is only one --- installer/config.php | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'installer/config.php') diff --git a/installer/config.php b/installer/config.php index ece48f578..ee8eb7221 100644 --- a/installer/config.php +++ b/installer/config.php @@ -28,29 +28,29 @@ if (!empty($_POST['submit'])) { if($RCI->save_configfile()) { - echo '

The config files was saved successfully into '.RCMAIL_CONFIG_DIR.' directory of your Roundcube installation.'; + echo '

The config file was saved successfully into '.RCMAIL_CONFIG_DIR.' directory of your Roundcube installation.'; - if($RCI->legacy_config) { - echo '

Afterwards, please remove the old configuration files main.inc.php and db.inc.php from the config directory.'; - } + if($RCI->legacy_config) { + echo '

Afterwards, please remove the old configuration files main.inc.php and db.inc.php from the config directory.'; + } - echo '

'; + echo '

'; } else { - 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.
'; - echo ' Make sure that there are no characters outside the <?php ?> brackets when saving the file.'; - echo ' '; + 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.
'; + 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.'; - } + if($RCI->legacy_config) { + echo '

Afterwards, please remove the old configuration files main.inc.php and db.inc.php from the config directory.'; + } - echo '

'; + echo '

'; - $textbox = new html_textarea(array('rows' => 16, 'cols' => 60, 'class' => "configfile")); - echo $textbox->show(($_SESSION['config'])); + $textbox = new html_textarea(array('rows' => 16, 'cols' => 60, 'class' => "configfile")); + echo $textbox->show(($_SESSION['config'])); } echo '

Of course there are more options to configure. -- cgit v1.2.3