Changeset 1614 in subversion for trunk/roundcubemail/program/steps/error.inc

Timestamp:

Jul 28, 2008 7:45:35 AM (5 years ago)

Author:

thomasb

Message:

Show appropriate error message if config files are missing

File:

• trunk/roundcubemail/program/steps/error.inc (modified) (7 diffs)

trunk/roundcubemail/program/steps/error.inc

@@ -6 +6 @@
  |                                                                       |
  | 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                                            |
  |                                                                       |
@@ -22 +22 @@
 
 // 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';
@@ -40 +39 @@
 $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']);
@@ -62 +59 @@
 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.";
@@ -84 +83 @@
   else
     $__error_text = sprintf('Error No. [0x%04X]', $ERROR_CODE);
-  }
+}
 
 
@@ -98 +97 @@
 
 
-if ($OUTPUT->template_exists('error'))
-  {
+if ($OUTPUT && $OUTPUT->template_exists('error')) {
   $OUTPUT->reset();
   $OUTPUT->send('error');
-  }
+}
 
 
@@ -124 +122 @@
 EOF;
 
+exit;
 ?>