From 906953126e0657bc4a6cdc907f4735b7708d52f4 Mon Sep 17 00:00:00 2001 From: Dennis1993 Date: Tue, 16 Jul 2013 17:17:58 +0200 Subject: Update rcube_install.php write config file automatically to RCUBE_CONFIG_DIR --- installer/rcube_install.php | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/installer/rcube_install.php b/installer/rcube_install.php index 0f1bfe23e..cd467d32c 100644 --- a/installer/rcube_install.php +++ b/installer/rcube_install.php @@ -268,6 +268,21 @@ class rcube_install } + /** + * save generated config file in RCUBE_CONFIG_DIR + * + * @return boolean True if the file was saved successfully, false if not + */ + function save_configfile() + { + if(is_writable(RCUBE_CONFIG_DIR)) + { + return file_put_contents(RCUBE_CONFIG_DIR . 'config.inc.php', $_SESSION['config']); + } + + return false; + } + /** * Check the current configuration for missing properties * and deprecated or obsolete settings -- cgit v1.2.3 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(-) 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(-) 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 From 68eb1835e8f88b5375cf431c44571c79da1c5702 Mon Sep 17 00:00:00 2001 From: Thomas Bruederli Date: Wed, 17 Jul 2013 21:23:31 +0200 Subject: Keep unknown/plugin config options; only skip officially obsoleted ones --- installer/rcube_install.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/installer/rcube_install.php b/installer/rcube_install.php index 0f1bfe23e..0e137e11d 100644 --- a/installer/rcube_install.php +++ b/installer/rcube_install.php @@ -34,7 +34,7 @@ class rcube_install var $bool_config_props = array(); var $local_config = array('db_dsnw', 'default_host', 'support_url', 'des_key', 'plugins'); - var $obsolete_config = array('db_backend', 'double_auth'); + var $obsolete_config = array('db_backend', 'db_max_length', 'double_auth'); var $replaced_config = array( 'skin_path' => 'skin', 'locale_string' => 'language', @@ -44,6 +44,8 @@ class rcube_install 'pagesize' => 'mail_pagesize', 'default_imap_folders' => 'default_folders', 'top_posting' => 'reply_mode', + 'keep_alive' => 'refresh_interval', + 'min_keep_alive' => 'min_refresh_interval', ); // list of supported database drivers @@ -247,7 +249,9 @@ class rcube_install } // skip this property - if ((!array_key_exists($prop, $this->defaults) || ($value == $this->defaults[$prop])) && !in_array($prop, $this->local_config)) { + if (($value == $this->defaults[$prop]) && !in_array($prop, $this->local_config) + || in_array($prop, array_merge($this->obsolete_config, array_keys($this->replaced_config))) + || preg_match('/^db_(table|sequence)_/', $prop)) { continue; } -- cgit v1.2.3 From fd6b193c6e072339b5012945aae8b6aa2c0f95b7 Mon Sep 17 00:00:00 2001 From: Thomas Bruederli Date: Wed, 17 Jul 2013 21:38:00 +0200 Subject: Fix codestyle and indentation; use new save function in update script --- bin/update.sh | 2 +- installer/config.php | 30 ++++++++++++++---------------- installer/rcube_install.php | 11 +++++------ 3 files changed, 20 insertions(+), 23 deletions(-) diff --git a/bin/update.sh b/bin/update.sh index 71e2c630a..8bfb9d603 100755 --- a/bin/update.sh +++ b/bin/update.sh @@ -101,7 +101,7 @@ if ($RCI->configured) { if (!$error) { $RCI->merge_config(); echo ". writing " . RCMAIL_CONFIG_DIR . "/config.inc.php...\n"; - $written = file_put_contents(RCMAIL_CONFIG_DIR . '/config.inc.php', $RCI->create_config()); + $written = $RCI->save_configfile($RCI->create_config()); } // Success! diff --git a/installer/config.php b/installer/config.php index ee8eb7221..fd7932af4 100644 --- a/installer/config.php +++ b/installer/config.php @@ -26,31 +26,29 @@ $_SESSION['allowinstaller'] = true; if (!empty($_POST['submit'])) { $_SESSION['config'] = $RCI->create_config(); - if($RCI->save_configfile()) - { + if ($RCI->save_configfile($_SESSION['config'])) { echo '

The config file was saved successfully into '.RCMAIL_CONFIG_DIR.' directory of your Roundcube installation.'; - if($RCI->legacy_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 '

'; } - 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 ' '; - - 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 '

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.'; + } - 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. 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