From 77c28206a14b5bee3f3091f10cffd531bce5649c Mon Sep 17 00:00:00 2001
From: yllar <yllar.pajus@gmail.com>
Date: Sat, 16 Dec 2006 13:25:16 -0500
Subject: [PATCH] updated ja and fr translations
---
program/steps/error.inc | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/program/steps/error.inc b/program/steps/error.inc
index f2d639b..8ba39d3 100644
--- a/program/steps/error.inc
+++ b/program/steps/error.inc
@@ -6,7 +6,7 @@
| |
| This file is part of the RoundCube Webmail client |
| Copyright (C) 2005, RoundCube Dev. - Switzerland |
- | All rights reserved. |
+ | Licensed under the GNU GPL |
| |
| PURPOSE: |
| Display error message page |
@@ -34,6 +34,7 @@
» Safari 1.2+<br />
<br />
» JavaScript enabled<br />
+» Support for XMLHTTPRequest<br />
<p><i>Your configuration:</i><br />
$user_agent</p>
@@ -52,7 +53,7 @@
else if ($ERROR_CODE==404)
{
$__error_title = "REQUEST FAILED/FILE NOT FOUND";
- $request_url = $GLOBALS['HTTP_HOST'].$GLOBALS['REQUEST_URI'];
+ $request_url = htmlentities($_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']);
$__error_text = <<<EOF
The requested page was not found!<br />
Please contact your server-administrator.
@@ -68,11 +69,11 @@
{
$__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 = 'Error No. '.dechex($ERROR_CODE).')';
+ $__error_text = sprintf('Error No. [0x%04X]', $ERROR_CODE);
}
--
Gitblit v1.9.1