From bf00b95810c16471d6acbd8f9f4cc8b2b1530481 Mon Sep 17 00:00:00 2001
From: xue <>
Date: Tue, 3 Jan 2006 16:03:33 +0000
Subject: Added Error 400 templates. Fixed encoding problems for a few
templates.
---
.gitattributes | 4 ++
framework/Exceptions/templates/error-fr.html | 3 +-
framework/Exceptions/templates/error.html | 62 +++++++++++------------
framework/Exceptions/templates/error400-en.html | 33 ++++++++++++
framework/Exceptions/templates/error400-zh.html | 32 ++++++++++++
framework/Exceptions/templates/error400.html | 33 ++++++++++++
framework/Exceptions/templates/error404-en.html | 64 ++++++++++++------------
framework/Exceptions/templates/error404-fr.html | 3 +-
framework/Exceptions/templates/error404.html | 2 +-
framework/Exceptions/templates/error500-en.html | 2 +-
framework/Exceptions/templates/error500-fr.html | 3 +-
framework/Exceptions/templates/error500.html | 2 +-
framework/Exceptions/templates/error503-en.html | 2 +-
framework/Exceptions/templates/error503-fr.html | 3 +-
framework/Exceptions/templates/error503.html | 2 +-
framework/Exceptions/templates/exception-en.html | 2 +-
framework/Exceptions/templates/exception-fr.html | 3 +-
framework/Exceptions/templates/exception.html | 2 +-
framework/Exceptions/templates/readme.txt | 18 +++++++
19 files changed, 200 insertions(+), 75 deletions(-)
create mode 100644 framework/Exceptions/templates/error400-en.html
create mode 100644 framework/Exceptions/templates/error400-zh.html
create mode 100644 framework/Exceptions/templates/error400.html
create mode 100644 framework/Exceptions/templates/readme.txt
diff --git a/.gitattributes b/.gitattributes
index 47eb641a..71dadd11 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -110,6 +110,9 @@ framework/Exceptions/messages.txt -text
framework/Exceptions/templates/error-fr.html -text
framework/Exceptions/templates/error-zh.html -text
framework/Exceptions/templates/error.html -text
+framework/Exceptions/templates/error400-en.html -text
+framework/Exceptions/templates/error400-zh.html -text
+framework/Exceptions/templates/error400.html -text
framework/Exceptions/templates/error404-en.html -text
framework/Exceptions/templates/error404-fr.html -text
framework/Exceptions/templates/error404-zh.html -text
@@ -126,6 +129,7 @@ framework/Exceptions/templates/exception-en.html -text
framework/Exceptions/templates/exception-fr.html -text
framework/Exceptions/templates/exception-zh.html -text
framework/Exceptions/templates/exception.html -text
+framework/Exceptions/templates/readme.txt -text
framework/IO/TTextWriter.php -text
framework/Security/TAuthManager.php -text
framework/Security/TAuthorizationRule.php -text
diff --git a/framework/Exceptions/templates/error-fr.html b/framework/Exceptions/templates/error-fr.html
index 47b681de..c9c19015 100644
--- a/framework/Exceptions/templates/error-fr.html
+++ b/framework/Exceptions/templates/error-fr.html
@@ -1,7 +1,8 @@
-
+
%%ErrorMessage%%
-
-
-Error %%StatusCode%%
-%%ErrorMessage%%
-
-The above error happened when the server was processing your request.
-
-
-If you think this is a server error, please contact the webmaster.
-
-
-%%Time%% %%Version%%
-
-
+
+
+
+
+%%ErrorMessage%%
+
+
+
+Error %%StatusCode%%
+%%ErrorMessage%%
+
+The above error happened when the server was processing your request.
+
+
+If you think this is a server error, please contact the webmaster.
+
+
+%%Time%% %%Version%%
+
+
\ No newline at end of file
diff --git a/framework/Exceptions/templates/error400-en.html b/framework/Exceptions/templates/error400-en.html
new file mode 100644
index 00000000..629b360d
--- /dev/null
+++ b/framework/Exceptions/templates/error400-en.html
@@ -0,0 +1,33 @@
+
+
+
+
+Bad Request
+
+
+
+Bad Request
+%%ErrorMessage%%
+
+The request could not be understood by the server due to malformed syntax.
+Please do not repeat the request without modifications.
+
+
+If you think this is a server error, please contact the webmaster.
+
+
+%%Time%% %%Version%%
+
+
+
\ No newline at end of file
diff --git a/framework/Exceptions/templates/error400-zh.html b/framework/Exceptions/templates/error400-zh.html
new file mode 100644
index 00000000..08f93118
--- /dev/null
+++ b/framework/Exceptions/templates/error400-zh.html
@@ -0,0 +1,32 @@
+
+
+
+
+错误请求
+
+
+
+错误请求
+%%ErrorMessage%%
+
+服务器无法理解您的请求。请勿重复同样的请求。
+
+
+如果您确认这是服务器错误，请联系系统管理员。
+
+
+%%Time%% %%Version%%
+
+
+
\ No newline at end of file
diff --git a/framework/Exceptions/templates/error400.html b/framework/Exceptions/templates/error400.html
new file mode 100644
index 00000000..629b360d
--- /dev/null
+++ b/framework/Exceptions/templates/error400.html
@@ -0,0 +1,33 @@
+
+
+
+
+Bad Request
+
+
+
+Bad Request
+%%ErrorMessage%%
+
+The request could not be understood by the server due to malformed syntax.
+Please do not repeat the request without modifications.
+
+
+If you think this is a server error, please contact the webmaster.
+
+
+%%Time%% %%Version%%
+
+
+
\ No newline at end of file
diff --git a/framework/Exceptions/templates/error404-en.html b/framework/Exceptions/templates/error404-en.html
index abbc84a6..40862e0e 100644
--- a/framework/Exceptions/templates/error404-en.html
+++ b/framework/Exceptions/templates/error404-en.html
@@ -1,33 +1,33 @@
-
-
-
-
-Page Not Found
-
-
-
-%%ErrorMessage%%
-Error 404
-
-The requested URL was not found on this server.
-If you entered the URL manually please check your spelling and try again.
-
-
-If you think this is a server error, please contact the webmaster.
-
-
-%%Time%% %%Version%%
-
-
+
+
+
+
+Page Not Found
+
+
+
+%%ErrorMessage%%
+Error 404
+
+The requested URL was not found on this server.
+If you entered the URL manually please check your spelling and try again.
+
+
+If you think this is a server error, please contact the webmaster.
+
+
+%%Time%% %%Version%%
+
+
\ No newline at end of file
diff --git a/framework/Exceptions/templates/error404-fr.html b/framework/Exceptions/templates/error404-fr.html
index c353d7c1..4a417d71 100644
--- a/framework/Exceptions/templates/error404-fr.html
+++ b/framework/Exceptions/templates/error404-fr.html
@@ -1,7 +1,8 @@
-
+
Page Introuvable