diff options
| author | alecpl <alec@alec.pl> | 2011-05-04 18:53:11 +0000 |
|---|---|---|
| committer | alecpl <alec@alec.pl> | 2011-05-04 18:53:11 +0000 |
| commit | ba9c7b40f0dfcadf1d5711246e7b332ff7a60787 (patch) | |
| tree | 10d8bc0a125fe8bc29d33592a480e245c5627e21 /program/steps/utils/error.inc | |
| parent | 4a7ed027e4d9b605060cecc9bd97bc3dd2c1889b (diff) | |
- Apply fixes from trunk (up to r4728)
Diffstat (limited to 'program/steps/utils/error.inc')
| -rw-r--r-- | program/steps/utils/error.inc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/program/steps/utils/error.inc b/program/steps/utils/error.inc index 4f4d6cbe7..be3c656d2 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> |