From e48f8945b32ab5b67f1cdeb53a37d3d196e31e4d Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Fri, 20 May 2016 05:19:01 -0400
Subject: [PATCH] Fix bug where message list columns could be in wrong order after column drag-n-drop and list sorting
---
program/steps/utils/error.inc | 139 +++++++++++++++++++++++++++++----------------
1 files changed, 89 insertions(+), 50 deletions(-)
diff --git a/program/steps/utils/error.inc b/program/steps/utils/error.inc
index c472faa..16ff118 100644
--- a/program/steps/utils/error.inc
+++ b/program/steps/utils/error.inc
@@ -5,8 +5,11 @@
| program/steps/utils/error.inc |
| |
| This file is part of the Roundcube Webmail client |
- | Copyright (C) 2005-2010, Roundcube Dev. - Switzerland |
- | Licensed under the GNU GPL |
+ | Copyright (C) 2005-2015, The Roundcube Dev Team |
+ | |
+ | 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 |
@@ -14,23 +17,21 @@
+-----------------------------------------------------------------------+
| Author: Thomas Bruederli <roundcube@gmail.com> |
+-----------------------------------------------------------------------+
-
- $Id$
-
*/
+$rcmail = rcmail::get_instance();
// browser is not compatible with this application
-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
+if ($ERROR_CODE == 409) {
+ $user_agent = htmlentities($_SERVER['HTTP_USER_AGENT']);
+ $__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 />
+» Microsoft Internet Explorer 7+<br />
+» Mozilla Firefox 3+<br />
+» Chrome 10+<br />
+» Safari 4+<br />
+» Opera 8+<br />
<br />
» JavaScript enabled<br />
» Support for XMLHTTPRequest<br />
@@ -41,76 +42,115 @@
}
// authorization error
-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.";
+else if ($ERROR_CODE == 401) {
+ $__error_title = strtoupper($rcmail->gettext('errauthorizationfailed'));
+ $__error_text = nl2br($rcmail->gettext('errunauthorizedexplain') . "\n" .
+ $rcmail->gettext('errcontactserveradmin'));
+}
+
+// forbidden due to request check
+else if ($ERROR_CODE == 403) {
+ if ($_SERVER['REQUEST_METHOD'] == 'GET' && $rcmail->request_status == rcube::REQUEST_ERROR_URL) {
+ $url = $rcmail->url($_GET, true, false, true);
+ $add = html::a($url, $rcmail->gettext('clicktoresumesession'));
+ }
+ else {
+ $add = $rcmail->gettext('errcontactserveradmin');
+ }
+
+ $__error_title = strtoupper($rcmail->gettext('errrequestcheckfailed'));
+ $__error_text = nl2br($rcmail->gettext('errcsrfprotectionexplain')) . '<p>' . $add . '</p>';
}
// failed request (wrong step in URL)
-else if ($ERROR_CODE==404) {
- $__error_title = "REQUEST FAILED/FILE NOT FOUND";
- $request_url = htmlentities($_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']);
- $__error_text = <<<EOF
-The requested page was not found!<br />
-Please contact your server-administrator.
+else if ($ERROR_CODE == 404) {
+ $request_url = htmlentities($_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']);
+ $__error_title = strtoupper($rcmail->gettext('errnotfound'));
+ $__error_text = nl2br($rcmail->gettext('errnotfoundexplain') . "\n" .
+ $rcmail->gettext('errcontactserveradmin'));
-<p><i>Failed request:</i><br />
-http://$request_url</p>
-EOF;
+ $__error_text .= '<p><i>' . $rcmail->gettext('errfailedrequest') . ":</i><br />\n<tt>//$request_url</tt></p>";
+}
+
+// invalid compose ID
+else if ($ERROR_CODE == 450 && $_SERVER['REQUEST_METHOD'] == 'GET' && $rcmail->action == 'compose') {
+ $url = $rcmail->url('compose');
+
+ $__error_title = strtoupper($rcmail->gettext('errcomposesession'));
+ $__error_text = nl2br($rcmail->gettext('errcomposesessionexplain'))
+ . '<p>' . html::a($url, $rcmail->gettext('clicktocompose')) . '</p>';
}
// database connection error
-else if ($ERROR_CODE==601)
-{
- $__error_title = "CONFIGURATION ERROR";
- $__error_text = nl2br($ERROR_MESSAGE) . "<br />Please read the INSTALL instructions!";
+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.";
+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 {
- $__error_title = "SERVICE CURRENTLY NOT AVAILABLE!";
- $__error_text = "Please contact your server-administrator.";
+ $__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 = sprintf('Error No. [%s]', $ERROR_CODE);
+ if (($rcmail->config->get('debug_level') & 4) && $ERROR_MESSAGE) {
+ $__error_text = $ERROR_MESSAGE;
+ }
+ else {
+ $__error_text = sprintf('Error No. [%s]', $ERROR_CODE);
+ }
}
+// inform plugins
+if ($rcmail && $rcmail->plugins) {
+ $plugin = $rcmail->plugins->exec_hook('error_page', array(
+ 'code' => $ERROR_CODE,
+ 'title' => $__error_title,
+ 'text' => $__error_text,
+ ));
+
+ if (!empty($plugin['title']))
+ $__error_title = $plugin['title'];
+ if (!empty($plugin['text']))
+ $__error_text = $plugin['text'];
+}
+
+$HTTP_ERR_CODE = $ERROR_CODE && $ERROR_CODE < 600 ? $ERROR_CODE : 500;
// Ajax request
-if ($OUTPUT && ($OUTPUT instanceof rcube_json_output)) {
- header("HTTP/1.0 $ERROR_CODE $__error_title");
- die;
+if ($rcmail->output && $rcmail->output->type == 'js') {
+ header("HTTP/1.0 $HTTP_ERR_CODE $__error_title");
+ die;
}
// compose page content
$__page_content = <<<EOF
<div>
<h3 class="error-title">$__error_title</h3>
-<p class="error-text">$__error_text</p>
+<div class="error-text">$__error_text</div>
</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->set_env('server_error', $ERROR_CODE);
+ $rcmail->output->set_env('comm_path', $rcmail->comm_path);
+ $rcmail->output->send('error');
}
-$__skin = $CONFIG->skin ? $CONFIG->skin : 'default';
+$__skin = $rcmail->config->get('skin', 'default');
+$__productname = $rcmail->config->get('product_name', 'Roundcube Webmail');
// 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>
+<title>$__productname :: ERROR</title>
<link rel="stylesheet" type="text/css" href="skins/$__skin/common.css" />
</head>
<body>
@@ -126,4 +166,3 @@
EOF;
exit;
-
--
Gitblit v1.9.1