summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xbin/update.sh2
-rw-r--r--installer/config.php30
-rw-r--r--installer/rcube_install.php11
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 '<p class="notice">The config file was saved successfully into <tt>'.RCMAIL_CONFIG_DIR.'</tt> directory of your Roundcube installation.';
- if($RCI->legacy_config) {
+ if ($RCI->legacy_config) {
echo '<br/><br/>Afterwards, please <b>remove</b> the old configuration files <tt>main.inc.php</tt> and <tt>db.inc.php</tt> from the config directory.';
}
echo '</p>';
}
- else
- {
- echo '<p class="notice">Copy or download the following configuration and save it';
- echo ' as <tt><b>config.inc.php</b></tt> within the <tt>'.RCUBE_CONFIG_DIR.'</tt> directory of your Roundcube installation.<br/>';
- echo ' Make sure that there are no characters outside the <tt>&lt;?php ?&gt;</tt> brackets when saving the file.';
- echo '&nbsp;<input type="button" onclick="location.href=\'index.php?_getconfig=1\'" value="Download" />';
-
- if($RCI->legacy_config) {
- echo '<br/><br/>Afterwards, please <b>remove</b> the old configuration files <tt>main.inc.php</tt> and <tt>db.inc.php</tt> from the config directory.';
- }
+ else {
+ echo '<p class="notice">Copy or download the following configuration and save it';
+ echo ' as <tt><b>config.inc.php</b></tt> within the <tt>'.RCUBE_CONFIG_DIR.'</tt> directory of your Roundcube installation.<br/>';
+ echo ' Make sure that there are no characters outside the <tt>&lt;?php ?&gt;</tt> brackets when saving the file.';
+ echo '&nbsp;<input type="button" onclick="location.href=\'index.php?_getconfig=1\'" value="Download" />';
+
+ if ($RCI->legacy_config) {
+ echo '<br/><br/>Afterwards, please <b>remove</b> the old configuration files <tt>main.inc.php</tt> and <tt>db.inc.php</tt> from the config directory.';
+ }
- echo '</p>';
+ echo '</p>';
- $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 '<p class="hint">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;
}
/**