Show appropriate error message if config files are missing

3 files changed, 51 insertions, 27 deletions

diff --git a/index.php b/index.php
index 839a75f08..deb86c6dc 100644
--- a/index.php
+++ b/index.php
@@ -52,6 +52,15 @@ if ($RCMAIL->action != 'get' && $RCMAIL->action != 'viewsource') {
   }
 }
 
+
+// check if config files had errors
+if ($err_str = $RCMAIL->config->get_error()) {
+  raise_error(array(
+    'code' => 601,
+    'type' => 'php',
+    'message' => $err_str), false, true);
+}
+
 // check DB connections and exit on failure
 if ($err_str = $DB->is_error()) {
   raise_error(array(
diff --git a/program/include/rcube_config.php b/program/include/rcube_config.php
index 14316b8b8..db53fe7e1 100644
--- a/program/include/rcube_config.php
+++ b/program/include/rcube_config.php
@@ -27,6 +27,7 @@
 class rcube_config
 {
   private $prop = array();
+  private $errors = array();
 
 
   /**
@@ -50,12 +51,16 @@ class rcube_config
     ob_start();
     
     // load main config file
-    include_once(INSTALL_PATH . 'config/main.inc.php');
-    $this->prop = (array)$rcmail_config;
+    if (include(INSTALL_PATH . 'config/main.inc.php'))
+      $this->prop = (array)$rcmail_config;
+    else
+      $this->errors[] = 'main.inc.php was not found.';
 
     // load database config
-    include_once(INSTALL_PATH . 'config/db.inc.php');
-    $this->prop += (array)$rcmail_config;
+    if (include(INSTALL_PATH . 'config/db.inc.php'))
+      $this->prop += (array)$rcmail_config;
+    else
+      $this->errors[] = 'db.inc.php was not found.';
     
     // load host-specific configuration
     $this->load_host_config();
@@ -222,6 +227,17 @@ class rcube_config
     
     return $domain;
   }
+  
+  
+  /**
+   * Getter for error state
+   *
+   * @return mixed Error message on error, False if no errors
+   */
+  public function get_error()
+  {
+    return empty($this->errors) ? false : join("\n", $this->errors);
+  }
 
 
 }
diff --git a/program/steps/error.inc b/program/steps/error.inc
index bd6fa2873..f1099e0d6 100644
--- a/program/steps/error.inc
+++ b/program/steps/error.inc
@@ -5,7 +5,7 @@
  | program/steps/error.inc                                               |
  |                                                                       |
  | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005-2007, RoundCube Dev. - Switzerland                 |
+ | Copyright (C) 2005-2008, RoundCube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
@@ -21,8 +21,7 @@
 
 
 // browser is not compatible with this application
-if ($ERROR_CODE==409)
-  {
+if ($ERROR_CODE==409) {
   $user_agent = $GLOBALS['HTTP_SERVER_VARS']['HTTP_USER_AGENT'];
   $__error_title = 'Your browser does not suit the requirements for this application';
   $__error_text = <<<EOF
@@ -39,19 +38,17 @@ if ($ERROR_CODE==409)
 <p><i>Your configuration:</i><br />
 $user_agent</p>
 EOF;
-  }
+}
 
 // authorization error
-else if ($ERROR_CODE==401)
-  {
+else if ($ERROR_CODE==401) {
   $__error_title = "AUTHORIZATION FAILED";
   $__error_text  = "Could not verify that you are authorized to access this service!<br />\n".
                    "Please contact your server-administrator.";
-  }
+}
   
 // failed request (wrong step in URL)
-else if ($ERROR_CODE==404)
-  {
+else if ($ERROR_CODE==404) {
   $__error_title = "REQUEST FAILED/FILE NOT FOUND";
   $request_url = htmlentities($_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']);
   $__error_text  = <<<EOF
@@ -61,21 +58,23 @@ Please contact your server-administrator.
 <p><i>Failed request:</i><br />
 http://$request_url</p>
 EOF;
-  }
+}
 
 // database connection error
-else if ($ERROR_CODE==603)
-  {
+else if ($ERROR_CODE==601)
+{
+  $__error_title = "CONFIGURATION ERROR";
+  $__error_text  =  nl2br($ERROR_MESSAGE) . "<br />Please read the INSTALL instructions!";
+}
+
+// database connection error
+else if ($ERROR_CODE==603) {
   $__error_title = "DATABASE ERROR: CONNECTION FAILED!";
-  $__error_text  =  <<<EOF
-Unable to connect to the database!<br /> 
-Please contact your server-administrator. 
-EOF;
-  }
+  $__error_text  =  "Unable to connect to the database!<br />Please contact your server-administrator.";
+}
 
 // system error
-else
-  {
+else {
   $__error_title = "SERVICE CURRENTLY NOT AVAILABLE!";
   $__error_text  = "Please contact your server-administrator.";
 
@@ -83,7 +82,7 @@ else
     $__error_text = $ERROR_MESSAGE;
   else
     $__error_text = sprintf('Error No. [0x%04X]', $ERROR_CODE);
-  }
+}
 
 
 // compose page content
@@ -97,11 +96,10 @@ EOF;
 
 
 
-if ($OUTPUT->template_exists('error'))
-  {
+if ($OUTPUT && $OUTPUT->template_exists('error')) {
   $OUTPUT->reset();
   $OUTPUT->send('error');
-  }
+}
 
 
 // print system error page
@@ -123,4 +121,5 @@ $__page_content
 </html>
 EOF;
 
+exit;
 ?>