banananetwork
/
roundcubemail
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- Fix usage of non-standard HTTP error codes (#1487797)

Browse Source
release-0.6
alecpl 14 years ago
parent 3a24a1e41f
commit d7b35c22af
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File

1
CHANGELOG
Unescape Escape View File

@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail CHANGELOG Roundcube Webmail
=========================== ===========================
- Fix usage of non-standard HTTP error codes (#1487797)
- Improve performance by including files with absolute path (#1487849) - Improve performance by including files with absolute path (#1487849)
- TinyMCE 3.4.2 now compatible with IE9 - TinyMCE 3.4.2 now compatible with IE9
- Move folder name truncation to client/skin (#1485412) - Move folder name truncation to client/skin (#1485412)

6
program/steps/utils/error.inc
Unescape Escape View File

@ -91,10 +91,11 @@ else {
$__error_text = sprintf('Error No. [%s]', $ERROR_CODE); $__error_text = sprintf('Error No. [%s]', $ERROR_CODE);
} }
$HTTP_ERR_CODE = $ERROR_CODE && $ERROR_CODE < 600 ? $ERROR_CODE : 500;
// Ajax request // Ajax request
if ($OUTPUT && ($OUTPUT instanceof rcube_json_output)) { if ($OUTPUT && ($OUTPUT instanceof rcube_json_output)) {
header("HTTP/1.0 $ERROR_CODE $__error_title"); header("HTTP/1.0 $HTTP_ERR_CODE $__error_title");
die; die;
} }
@ -112,12 +113,13 @@ if ($OUTPUT && $OUTPUT->template_exists('error')) {
} }
$__skin = $CONFIG->skin ? $CONFIG->skin : 'default'; $__skin = $CONFIG->skin ? $CONFIG->skin : 'default';
$__productname = $CONFIG['product_name'] ? $CONFIG['product_name'] : 'Roundcube Webmail';
// print system error page // print system error page
print <<<EOF print <<<EOF
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <!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> <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" /> <link rel="stylesheet" type="text/css" href="skins/$__skin/common.css" />
</head> </head>
<body> <body>

Write Preview
Loading…
Cancel
Save