From 32ca1f9fc8a78e092565b51cc97faa724bb4e6cf Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Sat, 30 May 2009 05:09:57 -0400
Subject: [PATCH] - css fixes (#1485869)
---
program/steps/error.inc | 66 +++++++++++++++++++-------------
1 files changed, 39 insertions(+), 27 deletions(-)
diff --git a/program/steps/error.inc b/program/steps/error.inc
index efe3040..f8bb846 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-2009, 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 @@
» Safari 1.2+<br />
<br />
» JavaScript enabled<br />
+» 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 = $GLOBALS['HTTP_HOST'].$GLOBALS['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,24 +58,40 @@
<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. [%s]', $ERROR_CODE);
+}
+
+// Ajax request
+if ($OUTPUT && ($OUTPUT instanceof rcube_json_output)) {
+ header("HTTP/1.0 $ERROR_CODE $__error_title");
+ die;
+}
// compose page content
-
$__page_content = <<<EOF
<div>
<h3 class="error-title">$__error_title</h3>
@@ -85,22 +99,19 @@
</div>
EOF;
+if ($OUTPUT && $OUTPUT->template_exists('error')) {
+ $OUTPUT->reset();
+ $OUTPUT->send('error');
+}
-
-if (template_exists('error'))
- {
- $OUTPUT->scripts = array();
- $OUTPUT->script_files = array();
- parse_template('error');
- }
-
+$__skin = $CONFIG->skin ? $CONFIG->skin : 'default';
// print system error page
print <<<EOF
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"><head>
<title>RoundCube|Mail : ERROR $ERROR_CODE</title>
-<link rel="stylesheet" type="text/css" href="program/style.css" />
+<link rel="stylesheet" type="text/css" href="skins/$__skin/common.css" />
</head>
<body>
@@ -114,4 +125,5 @@
</html>
EOF;
-?>
\ No newline at end of file
+exit;
+?>
--
Gitblit v1.9.1