Add hint for saving config files + stop DB initialization if en error occurs

git-svn-id: https://svn.roundcube.net/trunk@1256 208e9e7b-5314-0410-a742-e7e81cd9613c

2 files changed, 4 insertions, 1 deletions

diff --git a/roundcubemail/installer/config.php b/roundcubemail/installer/config.php
index 9845bb3f3..dc85faa6c 100644
--- a/roundcubemail/installer/config.php
+++ b/roundcubemail/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/roundcubemail/installer/rcube_install.php b/roundcubemail/installer/rcube_install.php
index 07a9922b7..12cd5c10d 100644
--- a/roundcubemail/installer/rcube_install.php
+++ b/roundcubemail/installer/rcube_install.php
@@ -305,6 +305,8 @@ class rcube_install
         if (eregi(';$', trim($line))) {
           $DB->query($buff);
           $buff = '';
+          if ($this->get_error())
+            break;
         }
       }
     }