summaryrefslogtreecommitdiffstats
path: root/application/errors
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2017-09-09 16:05:22 +0200
committerFlorian Pritz <bluewind@xinu.at>2017-09-09 16:05:22 +0200
commit27639d64d06b62f237bbde253c46cd28fdce8884 (patch)
tree7a2f00cfd44cfcdfe6cb1abc1cfc0675632948c4 /application/errors
parent9c5bfbee5b42ea50a5611c537b8dbf01d7a64f79 (diff)
parent6c7a4266410070d30f8f6bcdf9c9e67f3d6478e3 (diff)
Merge tag '3.1.5' into dev-ci3
Signed-off-by: Florian Pritz <bluewind@xinu.at>
Diffstat (limited to 'application/errors')
-rw-r--r--application/errors/error_404.php3
-rw-r--r--application/errors/error_db.php3
-rw-r--r--application/errors/error_general.php104
-rw-r--r--application/errors/index.html10
4 files changed, 0 insertions, 120 deletions
diff --git a/application/errors/error_404.php b/application/errors/error_404.php
deleted file mode 100644
index 2e69d7e00..000000000
--- a/application/errors/error_404.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-$title = "404 Page Not Found";
-include APPPATH."errors/error_general.php";
diff --git a/application/errors/error_db.php b/application/errors/error_db.php
deleted file mode 100644
index 827d7cc31..000000000
--- a/application/errors/error_db.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-$title = "Database Error";
-include APPPATH."errors/error_general.php";
diff --git a/application/errors/error_general.php b/application/errors/error_general.php
deleted file mode 100644
index 14e5e7a2e..000000000
--- a/application/errors/error_general.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-
-// fancy error page only works if we can load helpers
-if (class_exists("CI_Controller") && !isset($GLOBALS["is_error_page"]) && isset(get_instance()->load)) {
- if (!isset($title)) {
- $title = "Error";
- }
- $GLOBALS["is_error_page"] = true;
-
- $CI =& get_instance();
- $CI->load->helper("filebin");
- $CI->load->helper("url");
-
- if ($CI->input->is_cli_request()) {
- $message = str_replace("</p>", "</p>\n", $message);
- $message = strip_tags($message);
- echo "$heading: $message\n";
- exit();
- }
-
- include APPPATH.'views/header.php';
-
- ?>
- <div class="error">
- <h1><?php echo $heading; ?></h1>
- <?php echo $message; ?>
- </div>
-
- <?php
- include APPPATH.'views/footer.php';
-} elseif (php_sapi_name() === 'cli' OR defined('STDIN')) {
- echo "# $heading\n";
- $msg = strip_tags(str_replace("<br>", "\n", $message));
- foreach (explode("\n", $msg) as $line) {
- echo "# $line\n";
- }
- exit(255);
-} else {
- // default CI error page
-?>
-<!DOCTYPE html>
-<html lang="en">
-<head>
-<title>Error</title>
-<style type="text/css">
-
-::selection{ background-color: #E13300; color: white; }
-::moz-selection{ background-color: #E13300; color: white; }
-::webkit-selection{ background-color: #E13300; color: white; }
-
-body {
- background-color: #fff;
- margin: 40px;
- font: 13px/20px normal Helvetica, Arial, sans-serif;
- color: #4F5155;
-}
-
-a {
- color: #003399;
- background-color: transparent;
- font-weight: normal;
-}
-
-h1 {
- color: #444;
- background-color: transparent;
- border-bottom: 1px solid #D0D0D0;
- font-size: 19px;
- font-weight: normal;
- margin: 0 0 14px 0;
- padding: 14px 15px 10px 15px;
-}
-
-code {
- font-family: Consolas, Monaco, Courier New, Courier, monospace;
- font-size: 12px;
- background-color: #f9f9f9;
- border: 1px solid #D0D0D0;
- color: #002166;
- display: block;
- margin: 14px 0 14px 0;
- padding: 12px 10px 12px 10px;
-}
-
-#container {
- margin: 10px;
- border: 1px solid #D0D0D0;
- -webkit-box-shadow: 0 0 8px #D0D0D0;
-}
-
-p, div {
- margin: 12px 15px 12px 15px;
-}
-</style>
-</head>
-<body>
- <div id="container">
- <h1><?php echo $heading; ?></h1>
- <?php echo $message; ?>
- </div>
-</body>
-</html>
-<?php
-}
diff --git a/application/errors/index.html b/application/errors/index.html
deleted file mode 100644
index c942a79ce..000000000
--- a/application/errors/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<head>
- <title>403 Forbidden</title>
-</head>
-<body>
-
-<p>Directory access is forbidden.</p>
-
-</body>
-</html> \ No newline at end of file