From 7dfb1fba5001299300736e6b5d95d9400575e3e7 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Thu, 18 Sep 2008 14:59:02 -0400
Subject: [PATCH] Set the right number of arguments for setcookie()

---
 program/steps/error.inc |   54 +++++++++++++++++++++++++++++++-----------------------
 1 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/program/steps/error.inc b/program/steps/error.inc
index 9e5757d..f1099e0 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, 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
@@ -34,25 +33,24 @@
 &raquo; &nbsp;Safari 1.2+<br />
 <br />
 &raquo; &nbsp;JavaScript enabled<br />
+&raquo; &nbsp;Support for XMLHTTPRequest<br />
 
 <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 = $_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'];
+  $request_url = htmlentities($_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']);
   $__error_text  = <<<EOF
 The requested page was not found!<br />
 Please contact your server-administrator.
@@ -60,20 +58,31 @@
 <p><i>Failed request:</i><br />
 http://$request_url</p>
 EOF;
-  }
+}
 
+// database connection error
+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  =  "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.";
-  
+
   if (($CONFIG['debug_level'] & 4) && $ERROR_MESSAGE)
     $__error_text = $ERROR_MESSAGE;
   else
-    $__error_text = 'Error No. '.dechex($ERROR_CODE).')';
-  }
+    $__error_text = sprintf('Error No. [0x%04X]', $ERROR_CODE);
+}
 
 
 // compose page content
@@ -87,12 +96,10 @@
 
 
 
-if (template_exists('error'))
-  {
-  $OUTPUT->scripts = array();
-  $OUTPUT->script_files = array();
-  parse_template('error');
-  }
+if ($OUTPUT && $OUTPUT->template_exists('error')) {
+  $OUTPUT->reset();
+  $OUTPUT->send('error');
+}
 
 
 // print system error page
@@ -114,4 +121,5 @@
 </html>
 EOF;
 
-?>
\ No newline at end of file
+exit;
+?>

--
Gitblit v1.9.1