summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorthomascube <thomas@roundcube.net>2008-04-05 12:53:47 +0000
committerthomascube <thomas@roundcube.net>2008-04-05 12:53:47 +0000
commitc0dc9072c142c4e8b70bc5545f24f6946d89a960 (patch)
treed756c4bac97aa580e712fe7489bd831b8b649caa
parentf5e8d23e8e7e69a6c2032e2878aa37da65af3455 (diff)
Add hint for saving config files + stop DB initialization if en error occurs
-rw-r--r--installer/config.php3
-rw-r--r--installer/rcube_install.php2
2 files changed, 4 insertions, 1 deletions
diff --git a/installer/config.php b/installer/config.php
index 9845bb3f3..dc85faa6c 100644
--- a/installer/config.php
+++ b/installer/config.php
@@ -26,7 +26,8 @@ $_SESSION['allowinstaller'] = true;
if (!empty($_POST['submit'])) {
echo '<p class="notice">Copy the following configurations and save them in two files (names above the text box)';
- echo ' within the <tt>config/</tt> directory of your RoundCube installation.</p>';
+ echo ' within the <tt>config/</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 files.</p>';
$textbox = new textarea(array('rows' => 16, 'cols' => 60, 'class' => "configfile"));
diff --git a/installer/rcube_install.php b/installer/rcube_install.php
index 07a9922b7..12cd5c10d 100644
--- a/installer/rcube_install.php
+++ b/installer/rcube_install.php
@@ -305,6 +305,8 @@ class rcube_install
if (eregi(';$', trim($line))) {
$DB->query($buff);
$buff = '';
+ if ($this->get_error())
+ break;
}
}
}