From c0dc9072c142c4e8b70bc5545f24f6946d89a960 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Sat, 05 Apr 2008 08:53:47 -0400
Subject: [PATCH] Add hint for saving config files + stop DB initialization if en error occurs

---
 installer/rcube_install.php |    2 ++
 installer/config.php        |    3 ++-
 2 files changed, 4 insertions(+), 1 deletions(-)

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

--
Gitblit v1.9.1