From 0c259682f65eaaf23ea4ccb56a706d6baf3007e4 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Fri, 13 Apr 2012 04:52:02 -0400
Subject: [PATCH] - Merge devel-framework branch, resolved conflicts
---
program/steps/utils/error.inc | 28 ++++++++++++++++------------
1 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/program/steps/utils/error.inc b/program/steps/utils/error.inc
index 63ba216..0006744 100644
--- a/program/steps/utils/error.inc
+++ b/program/steps/utils/error.inc
@@ -6,7 +6,10 @@
| |
| This file is part of the Roundcube Webmail client |
| Copyright (C) 2005-2011, The Roundcube Dev Team |
- | Licensed under the GNU GPL |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
| |
| PURPOSE: |
| Display error message page |
@@ -19,6 +22,7 @@
*/
+$rcmail = rcmail::get_instance();
// browser is not compatible with this application
if ($ERROR_CODE==409) {
@@ -26,11 +30,11 @@
$__error_title = 'Your browser does not suit the requirements for this application';
$__error_text = <<<EOF
<i>Supported browsers:</i><br />
-» Netscape 7+<br />
» Microsoft Internet Explorer 6+<br />
-» Mozilla Firefox 1.0+<br />
-» Opera 8.0+<br />
-» Safari 1.2+<br />
+» Mozilla Firefox 3+<br />
+» Chrome 10+<br />
+» Safari 4+<br />
+» Opera 8+<br />
<br />
» JavaScript enabled<br />
» Support for XMLHTTPRequest<br />
@@ -85,7 +89,7 @@
$__error_title = "SERVICE CURRENTLY NOT AVAILABLE!";
$__error_text = "Please contact your server-administrator.";
- if (($CONFIG['debug_level'] & 4) && $ERROR_MESSAGE)
+ if (($rcmail->config->get('debug_level') & 4) && $ERROR_MESSAGE)
$__error_text = $ERROR_MESSAGE;
else
$__error_text = sprintf('Error No. [%s]', $ERROR_CODE);
@@ -94,7 +98,7 @@
$HTTP_ERR_CODE = $ERROR_CODE && $ERROR_CODE < 600 ? $ERROR_CODE : 500;
// Ajax request
-if ($OUTPUT && ($OUTPUT instanceof rcube_json_output)) {
+if ($rcmail->output && $rcmail->output->type == 'js') {
header("HTTP/1.0 $HTTP_ERR_CODE $__error_title");
die;
}
@@ -107,13 +111,13 @@
</div>
EOF;
-if ($OUTPUT && $OUTPUT->template_exists('error')) {
- $OUTPUT->reset();
- $OUTPUT->send('error');
+if ($rcmail->output && $rcmail->output->template_exists('error')) {
+ $rcmail->output->reset();
+ $rcmail->output->send('error');
}
-$__skin = $CONFIG->skin ? $CONFIG->skin : 'default';
-$__productname = $CONFIG['product_name'] ? $CONFIG['product_name'] : 'Roundcube Webmail';
+$__skin = $rcmail->config->get('skin', 'default');
+$__productname = $rcmail->config->get('product_name', 'Roundcube Webmail');
// print system error page
print <<<EOF
--
Gitblit v1.9.1