summaryrefslogtreecommitdiffstats
path: root/application/views/errors
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2023-01-29 13:58:21 +0100
committerFlorian Pritz <bluewind@xinu.at>2023-01-29 13:58:21 +0100
commitc88be04f0ec35304be812d7f5379c4362008b730 (patch)
tree0d161faf7b5d03396fcab28e1ecb8e8764f32cb2 /application/views/errors
parent457e351cbc1335de951f4ac79bb91a9f3ea9ab38 (diff)
parenta6faab2ebf082eefff9c2422fce016e49da548bf (diff)
Merge remote-tracking branch 'upstream/develop' into dev
Signed-off-by: Florian Pritz <bluewind@xinu.at>
Diffstat (limited to 'application/views/errors')
-rw-r--r--application/views/errors/cli/index.html2
-rw-r--r--application/views/errors/html/error_exception.php38
-rw-r--r--application/views/errors/html/error_general.php117
-rw-r--r--application/views/errors/html/error_php.php38
-rw-r--r--application/views/errors/html/index.html2
-rw-r--r--application/views/errors/index.html2
6 files changed, 111 insertions, 88 deletions
diff --git a/application/views/errors/cli/index.html b/application/views/errors/cli/index.html
index b702fbc39..bcb7cae34 100644
--- a/application/views/errors/cli/index.html
+++ b/application/views/errors/cli/index.html
@@ -1,5 +1,5 @@
<!DOCTYPE html>
-<html>
+<html lang="en">
<head>
<title>403 Forbidden</title>
</head>
diff --git a/application/views/errors/html/error_exception.php b/application/views/errors/html/error_exception.php
index 87848866a..befa12955 100644
--- a/application/views/errors/html/error_exception.php
+++ b/application/views/errors/html/error_exception.php
@@ -2,31 +2,31 @@
defined('BASEPATH') OR exit('No direct script access allowed');
?>
-<div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
+<div style="border:1px solid #dd4814;padding-left:20px;margin:10px 0;">
-<h4>An uncaught Exception was encountered</h4>
+ <h4>An uncaught Exception was encountered</h4>
-<p>Type: <?php echo get_class($exception); ?></p>
-<p>Message: <?php echo $message; ?></p>
-<p>Filename: <?php echo $exception->getFile(); ?></p>
-<p>Line Number: <?php echo $exception->getLine(); ?></p>
+ <p>Type: <?php echo get_class($exception); ?></p>
+ <p>Message: <?php echo $message; ?></p>
+ <p>Filename: <?php echo $exception->getFile(); ?></p>
+ <p>Line Number: <?php echo $exception->getLine(); ?></p>
-<?php if (defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE === TRUE): ?>
+ <?php if (defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE === TRUE): ?>
- <p>Backtrace:</p>
- <?php foreach ($exception->getTrace() as $error): ?>
+ <p>Backtrace:</p>
+ <?php foreach ($exception->getTrace() as $error): ?>
- <?php if (isset($error['file']) && strpos($error['file'], realpath(BASEPATH)) !== 0): ?>
+ <?php if (isset($error['file']) && strpos($error['file'], realpath(BASEPATH)) !== 0): ?>
- <p style="margin-left:10px">
- File: <?php echo $error['file']; ?><br />
- Line: <?php echo $error['line']; ?><br />
- Function: <?php echo $error['function']; ?>
- </p>
- <?php endif ?>
+ <p style="margin-left:10px">
+ File: <?php echo $error['file']; ?><br />
+ Line: <?php echo $error['line']; ?><br />
+ Function: <?php echo $error['function']; ?>
+ </p>
+ <?php endif ?>
- <?php endforeach ?>
+ <?php endforeach ?>
-<?php endif ?>
+ <?php endif ?>
-</div> \ No newline at end of file
+</div>
diff --git a/application/views/errors/html/error_general.php b/application/views/errors/html/error_general.php
index 0f809dccd..637a1fd35 100644
--- a/application/views/errors/html/error_general.php
+++ b/application/views/errors/html/error_general.php
@@ -41,62 +41,85 @@ if (class_exists("CI_Controller") && !isset($GLOBALS["is_error_page"]) && isset(
?><!DOCTYPE html>
<html lang="en">
<head>
-<meta charset="utf-8">
-<title>Error</title>
-<style type="text/css">
-
-::selection { background-color: #E13300; color: white; }
-::-moz-selection { background-color: #E13300; color: white; }
-
-body {
- background-color: #fff;
- margin: 40px;
- font: 13px/20px normal Helvetica, Arial, sans-serif;
- color: #4F5155;
-}
+ <meta charset="utf-8">
+ <title>Error</title>
+ <style type="text/css">
-a {
- color: #003399;
- background-color: transparent;
- font-weight: normal;
-}
+ ::selection { background-color: #f07746; color: #fff; }
+ ::-moz-selection { background-color: #f07746; color: #fff; }
-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;
-}
+ body {
+ background-color: #fff;
+ margin: 40px auto;
+ max-width: 1024px;
+ font: 16px/24px normal "Helvetica Neue", Helvetica, Arial, sans-serif;
+ color: #808080;
+ }
-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;
-}
+ a {
+ color: #dd4814;
+ background-color: transparent;
+ font-weight: normal;
+ text-decoration: none;
+ }
-#container {
- margin: 10px;
- border: 1px solid #D0D0D0;
- box-shadow: 0 0 8px #D0D0D0;
-}
+ a:hover {
+ color: #97310e;
+ }
-p, div {
- margin: 12px 15px 12px 15px;
-}
-</style>
+ h1 {
+ color: #fff;
+ background-color: #dd4814;
+ border-bottom: 1px solid #d0d0d0;
+ font-size: 22px;
+ font-weight: bold;
+ margin: 0 0 14px 0;
+ padding: 5px 15px;
+ line-height: 40px;
+ }
+
+ h2 {
+ color:#404040;
+ margin:0;
+ padding:0 0 10px 0;
+ }
+
+ code {
+ font-family: Consolas, Monaco, Courier New, Courier, monospace;
+ font-size: 13px;
+ background-color: #f5f5f5;
+ border: 1px solid #e3e3e3;
+ border-radius: 4px;
+ color: #002166;
+ display: block;
+ margin: 14px 0 14px 0;
+ padding: 12px 10px 12px 10px;
+ }
+
+ #container {
+ margin: 10px;
+ border: 1px solid #d0d0d0;
+ box-shadow: 0 0 8px #d0d0d0;
+ border-radius: 4px;
+ }
+
+ p {
+ margin: 0 0 10px;
+ padding:0;
+ }
+
+ #body {
+ margin: 0 15px 0 15px;
+ min-height: 96px;
+ }
+ </style>
</head>
<body>
<div id="container">
<h1><?php echo $heading; ?></h1>
- <?php echo $message; ?>
+ <div id="body">
+ <?php echo $message; ?>
+ </div>
</div>
</body>
</html>
diff --git a/application/views/errors/html/error_php.php b/application/views/errors/html/error_php.php
index b146f9c5b..8b445ef39 100644
--- a/application/views/errors/html/error_php.php
+++ b/application/views/errors/html/error_php.php
@@ -2,32 +2,32 @@
defined('BASEPATH') OR exit('No direct script access allowed');
?>
-<div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
+<div style="border:1px solid #dd4814;padding-left:20px;margin:10px 0;">
-<h4>A PHP Error was encountered</h4>
+ <h4>A PHP Error was encountered</h4>
-<p>Severity: <?php echo $severity; ?></p>
-<p>Message: <?php echo $message; ?></p>
-<p>Filename: <?php echo $filepath; ?></p>
-<p>Line Number: <?php echo $line; ?></p>
+ <p>Severity: <?php echo $severity; ?></p>
+ <p>Message: <?php echo $message; ?></p>
+ <p>Filename: <?php echo $filepath; ?></p>
+ <p>Line Number: <?php echo $line; ?></p>
-<?php if (defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE === TRUE): ?>
+ <?php if (defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE === TRUE): ?>
- <p>Backtrace:</p>
- <?php foreach (debug_backtrace() as $error): ?>
+ <p>Backtrace:</p>
+ <?php foreach (debug_backtrace() as $error): ?>
- <?php if (isset($error['file']) && strpos($error['file'], realpath(BASEPATH)) !== 0): ?>
+ <?php if (isset($error['file']) && strpos($error['file'], realpath(BASEPATH)) !== 0): ?>
- <p style="margin-left:10px">
- File: <?php echo $error['file'] ?><br />
- Line: <?php echo $error['line'] ?><br />
- Function: <?php echo $error['function'] ?>
- </p>
+ <p style="margin-left:10px">
+ File: <?php echo $error['file'] ?><br />
+ Line: <?php echo $error['line'] ?><br />
+ Function: <?php echo $error['function'] ?>
+ </p>
- <?php endif ?>
+ <?php endif ?>
- <?php endforeach ?>
+ <?php endforeach ?>
-<?php endif ?>
+ <?php endif ?>
-</div> \ No newline at end of file
+</div>
diff --git a/application/views/errors/html/index.html b/application/views/errors/html/index.html
index b702fbc39..bcb7cae34 100644
--- a/application/views/errors/html/index.html
+++ b/application/views/errors/html/index.html
@@ -1,5 +1,5 @@
<!DOCTYPE html>
-<html>
+<html lang="en">
<head>
<title>403 Forbidden</title>
</head>
diff --git a/application/views/errors/index.html b/application/views/errors/index.html
index b702fbc39..bcb7cae34 100644
--- a/application/views/errors/index.html
+++ b/application/views/errors/index.html
@@ -1,5 +1,5 @@
<!DOCTYPE html>
-<html>
+<html lang="en">
<head>
<title>403 Forbidden</title>
</head>
generated by cgit v1.2.3-24-g4f1b (git 2.32.0) at 2024-11-14 18:38:13 +0100