diff options
| author | alecpl <alec@alec.pl> | 2011-04-22 17:48:58 +0000 |
|---|---|---|
| committer | alecpl <alec@alec.pl> | 2011-04-22 17:48:58 +0000 |
| commit | d7b35c22affe6911f6f7338dc5ae602056da3eac (patch) | |
| tree | be733f7b9ba326e265803ce03452ae72d24b8e66 | |
| parent | 3a24a1e41fdd783caa799ce0dbc9c32aaea1f379 (diff) | |
- Fix usage of non-standard HTTP error codes (#1487797)
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | program/steps/utils/error.inc | 6 |
2 files changed, 5 insertions, 2 deletions
@@ -1,6 +1,7 @@ CHANGELOG Roundcube Webmail =========================== +- Fix usage of non-standard HTTP error codes (#1487797) - Improve performance by including files with absolute path (#1487849) - TinyMCE 3.4.2 now compatible with IE9 - Move folder name truncation to client/skin (#1485412) diff --git a/program/steps/utils/error.inc b/program/steps/utils/error.inc index 8b0496911..63ba21689 100644 --- a/program/steps/utils/error.inc +++ b/program/steps/utils/error.inc @@ -91,10 +91,11 @@ else { $__error_text = sprintf('Error No. [%s]', $ERROR_CODE); } +$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"); + header("HTTP/1.0 $HTTP_ERR_CODE $__error_title"); die; } @@ -112,12 +113,13 @@ if ($OUTPUT && $OUTPUT->template_exists('error')) { } $__skin = $CONFIG->skin ? $CONFIG->skin : 'default'; +$__productname = $CONFIG['product_name'] ? $CONFIG['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> |