From 29947ee882a8d519d62ca9061ed6513cedfb1930 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Tue, 12 Nov 2013 18:36:46 +0200 Subject: Add CLI error templates and only send HTTP status headers for non-CLI requests (issue #1743) --- application/views/errors/cli/error_404.php | 33 +++++++++ application/views/errors/cli/error_db.php | 33 +++++++++ application/views/errors/cli/error_general.php | 33 +++++++++ application/views/errors/cli/error_php.php | 50 ++++++++++++++ application/views/errors/cli/index.html | 10 +++ application/views/errors/error_404.php | 92 ------------------------- application/views/errors/error_db.php | 92 ------------------------- application/views/errors/error_general.php | 92 ------------------------- application/views/errors/error_php.php | 59 ---------------- application/views/errors/html/error_404.php | 92 +++++++++++++++++++++++++ application/views/errors/html/error_db.php | 92 +++++++++++++++++++++++++ application/views/errors/html/error_general.php | 92 +++++++++++++++++++++++++ application/views/errors/html/error_php.php | 58 ++++++++++++++++ application/views/errors/html/index.html | 10 +++ 14 files changed, 503 insertions(+), 335 deletions(-) create mode 100644 application/views/errors/cli/error_404.php create mode 100644 application/views/errors/cli/error_db.php create mode 100644 application/views/errors/cli/error_general.php create mode 100644 application/views/errors/cli/error_php.php create mode 100644 application/views/errors/cli/index.html delete mode 100644 application/views/errors/error_404.php delete mode 100644 application/views/errors/error_db.php delete mode 100644 application/views/errors/error_general.php delete mode 100644 application/views/errors/error_php.php create mode 100644 application/views/errors/html/error_404.php create mode 100644 application/views/errors/html/error_db.php create mode 100644 application/views/errors/html/error_general.php create mode 100644 application/views/errors/html/error_php.php create mode 100644 application/views/errors/html/index.html (limited to 'application/views/errors') diff --git a/application/views/errors/cli/error_404.php b/application/views/errors/cli/error_404.php new file mode 100644 index 000000000..68ffdb3d4 --- /dev/null +++ b/application/views/errors/cli/error_404.php @@ -0,0 +1,33 @@ + + +A PHP Error was encountered + +Severity: +Message: +Filename: +Line Number: + + + +Backtrace: + + + + File: + Line: + Function: + + + + + \ No newline at end of file diff --git a/application/views/errors/cli/index.html b/application/views/errors/cli/index.html new file mode 100644 index 000000000..c942a79ce --- /dev/null +++ b/application/views/errors/cli/index.html @@ -0,0 +1,10 @@ + + + 403 Forbidden + + + +

Directory access is forbidden.

+ + + \ No newline at end of file diff --git a/application/views/errors/error_404.php b/application/views/errors/error_404.php deleted file mode 100644 index 21ff6db37..000000000 --- a/application/views/errors/error_404.php +++ /dev/null @@ -1,92 +0,0 @@ - - - - -404 Page Not Found - - - -
-

- -
- - \ No newline at end of file diff --git a/application/views/errors/error_db.php b/application/views/errors/error_db.php deleted file mode 100644 index a251e1ca9..000000000 --- a/application/views/errors/error_db.php +++ /dev/null @@ -1,92 +0,0 @@ - - - - -Database Error - - - -
-

- -
- - \ No newline at end of file diff --git a/application/views/errors/error_general.php b/application/views/errors/error_general.php deleted file mode 100644 index b9d54384f..000000000 --- a/application/views/errors/error_general.php +++ /dev/null @@ -1,92 +0,0 @@ - - - - -Error - - - -
-

- -
- - \ No newline at end of file diff --git a/application/views/errors/error_php.php b/application/views/errors/error_php.php deleted file mode 100644 index c4e6b2934..000000000 --- a/application/views/errors/error_php.php +++ /dev/null @@ -1,59 +0,0 @@ - - -
- -

A PHP Error was encountered

- -

Severity:

-

Message:

-

Filename:

-

Line Number:

- - - -

Backtrace:

- - - - -

- File:
- Line:
- Function: -

- - - -

- - - -
\ No newline at end of file diff --git a/application/views/errors/html/error_404.php b/application/views/errors/html/error_404.php new file mode 100644 index 000000000..21ff6db37 --- /dev/null +++ b/application/views/errors/html/error_404.php @@ -0,0 +1,92 @@ + + + + +404 Page Not Found + + + +
+

+ +
+ + \ No newline at end of file diff --git a/application/views/errors/html/error_db.php b/application/views/errors/html/error_db.php new file mode 100644 index 000000000..a251e1ca9 --- /dev/null +++ b/application/views/errors/html/error_db.php @@ -0,0 +1,92 @@ + + + + +Database Error + + + +
+

+ +
+ + \ No newline at end of file diff --git a/application/views/errors/html/error_general.php b/application/views/errors/html/error_general.php new file mode 100644 index 000000000..b9d54384f --- /dev/null +++ b/application/views/errors/html/error_general.php @@ -0,0 +1,92 @@ + + + + +Error + + + +
+

+ +
+ + \ No newline at end of file diff --git a/application/views/errors/html/error_php.php b/application/views/errors/html/error_php.php new file mode 100644 index 000000000..2267d98af --- /dev/null +++ b/application/views/errors/html/error_php.php @@ -0,0 +1,58 @@ + + +
+ +

A PHP Error was encountered

+ +

Severity:

+

Message:

+

Filename:

+

Line Number:

+ + + +

Backtrace:

+ + + + +

+ File:
+ Line:
+ Function: +

+ + + +

+ + + +
\ No newline at end of file diff --git a/application/views/errors/html/index.html b/application/views/errors/html/index.html new file mode 100644 index 000000000..c942a79ce --- /dev/null +++ b/application/views/errors/html/index.html @@ -0,0 +1,10 @@ + + + 403 Forbidden + + + +

Directory access is forbidden.

+ + + \ No newline at end of file -- cgit v1.2.3-24-g4f1b From 797fd354fd0b29edae1d11761a133daaf9cf964e Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Fri, 3 Jan 2014 11:32:46 +0200 Subject: [ci skip] Manually apply PR #2746 and remove other -moz-box-shadow and -webkit-box-shadow usage --- application/views/errors/html/error_404.php | 2 -- application/views/errors/html/error_db.php | 2 -- application/views/errors/html/error_general.php | 2 -- 3 files changed, 6 deletions(-) (limited to 'application/views/errors') diff --git a/application/views/errors/html/error_404.php b/application/views/errors/html/error_404.php index 21ff6db37..11b8d99c1 100644 --- a/application/views/errors/html/error_404.php +++ b/application/views/errors/html/error_404.php @@ -74,8 +74,6 @@ code { margin: 10px; border: 1px solid #D0D0D0; box-shadow: 0 0 8px #D0D0D0; - -moz-box-shadow: 0 0 8px #D0D0D0; - -webkit-box-shadow: 0 0 8px #D0D0D0; } p { diff --git a/application/views/errors/html/error_db.php b/application/views/errors/html/error_db.php index a251e1ca9..f376e0990 100644 --- a/application/views/errors/html/error_db.php +++ b/application/views/errors/html/error_db.php @@ -74,8 +74,6 @@ code { margin: 10px; border: 1px solid #D0D0D0; box-shadow: 0 0 8px #D0D0D0; - -moz-box-shadow: 0 0 8px #D0D0D0; - -webkit-box-shadow: 0 0 8px #D0D0D0; } p { diff --git a/application/views/errors/html/error_general.php b/application/views/errors/html/error_general.php index b9d54384f..df435b3bd 100644 --- a/application/views/errors/html/error_general.php +++ b/application/views/errors/html/error_general.php @@ -74,8 +74,6 @@ code { margin: 10px; border: 1px solid #D0D0D0; box-shadow: 0 0 8px #D0D0D0; - -moz-box-shadow: 0 0 8px #D0D0D0; - -webkit-box-shadow: 0 0 8px #D0D0D0; } p { -- cgit v1.2.3-24-g4f1b