From 5dc051626acdd110f5e3ae8e9243668e6bb13d1a Mon Sep 17 00:00:00 2001
From: Alex Tselegidis <alextselegidis@gmail.com>
Date: Sun, 24 Apr 2016 18:14:32 +0200
Subject: [PATCH] Moved the application/errors directory to
 application/views/errors.

---
 .../views/errors/cli/error_404.php            |  8 +++++
 src/application/views/errors/cli/error_db.php |  8 +++++
 .../views/errors/cli/error_exception.php      | 21 ++++++++++++
 .../views/errors/cli/error_general.php        |  8 +++++
 .../views/errors/cli/error_php.php            | 21 ++++++++++++
 src/application/views/errors/cli/index.html   | 11 +++++++
 .../errors/html}/error_404.php                |  0
 .../errors/html}/error_db.php                 |  0
 .../views/errors/html/error_exception.php     | 32 +++++++++++++++++++
 .../errors/html}/error_general.php            |  0
 .../errors/html}/error_php.php                |  0
 .../{errors => views/errors/html}/index.html  |  0
 12 files changed, 109 insertions(+)
 create mode 100644 src/application/views/errors/cli/error_404.php
 create mode 100644 src/application/views/errors/cli/error_db.php
 create mode 100644 src/application/views/errors/cli/error_exception.php
 create mode 100644 src/application/views/errors/cli/error_general.php
 create mode 100644 src/application/views/errors/cli/error_php.php
 create mode 100644 src/application/views/errors/cli/index.html
 rename src/application/{errors => views/errors/html}/error_404.php (100%)
 rename src/application/{errors => views/errors/html}/error_db.php (100%)
 create mode 100644 src/application/views/errors/html/error_exception.php
 rename src/application/{errors => views/errors/html}/error_general.php (100%)
 rename src/application/{errors => views/errors/html}/error_php.php (100%)
 rename src/application/{errors => views/errors/html}/index.html (100%)

diff --git a/src/application/views/errors/cli/error_404.php b/src/application/views/errors/cli/error_404.php
new file mode 100644
index 00000000..6984b61e
--- /dev/null
+++ b/src/application/views/errors/cli/error_404.php
@@ -0,0 +1,8 @@
+<?php
+defined('BASEPATH') OR exit('No direct script access allowed');
+
+echo "\nERROR: ",
+	$heading,
+	"\n\n",
+	$message,
+	"\n\n";
\ No newline at end of file
diff --git a/src/application/views/errors/cli/error_db.php b/src/application/views/errors/cli/error_db.php
new file mode 100644
index 00000000..2ff43ffc
--- /dev/null
+++ b/src/application/views/errors/cli/error_db.php
@@ -0,0 +1,8 @@
+<?php
+defined('BASEPATH') OR exit('No direct script access allowed');
+
+echo "\nDatabase error: ",
+	$heading,
+	"\n\n",
+	$message,
+	"\n\n";
\ No newline at end of file
diff --git a/src/application/views/errors/cli/error_exception.php b/src/application/views/errors/cli/error_exception.php
new file mode 100644
index 00000000..efa6a66d
--- /dev/null
+++ b/src/application/views/errors/cli/error_exception.php
@@ -0,0 +1,21 @@
+<?php defined('BASEPATH') OR exit('No direct script access allowed'); ?>
+
+An uncaught Exception was encountered
+
+Type:        <?php echo get_class($exception), "\n"; ?>
+Message:     <?php echo $message, "\n"; ?>
+Filename:    <?php echo $exception->getFile(), "\n"; ?>
+Line Number: <?php echo $exception->getLine(); ?>
+
+<?php if (defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE === TRUE): ?>
+
+Backtrace:
+<?php	foreach ($exception->getTrace() as $error): ?>
+<?php		if (isset($error['file']) && strpos($error['file'], realpath(BASEPATH)) !== 0): ?>
+	File: <?php echo $error['file'], "\n"; ?>
+	Line: <?php echo $error['line'], "\n"; ?>
+	Function: <?php echo $error['function'], "\n\n"; ?>
+<?php		endif ?>
+<?php	endforeach ?>
+
+<?php endif ?>
diff --git a/src/application/views/errors/cli/error_general.php b/src/application/views/errors/cli/error_general.php
new file mode 100644
index 00000000..6984b61e
--- /dev/null
+++ b/src/application/views/errors/cli/error_general.php
@@ -0,0 +1,8 @@
+<?php
+defined('BASEPATH') OR exit('No direct script access allowed');
+
+echo "\nERROR: ",
+	$heading,
+	"\n\n",
+	$message,
+	"\n\n";
\ No newline at end of file
diff --git a/src/application/views/errors/cli/error_php.php b/src/application/views/errors/cli/error_php.php
new file mode 100644
index 00000000..8a24b649
--- /dev/null
+++ b/src/application/views/errors/cli/error_php.php
@@ -0,0 +1,21 @@
+<?php defined('BASEPATH') OR exit('No direct script access allowed'); ?>
+
+A PHP Error was encountered
+
+Severity:    <?php echo $severity, "\n"; ?>
+Message:     <?php echo $message, "\n"; ?>
+Filename:    <?php echo $filepath, "\n"; ?>
+Line Number: <?php echo $line; ?>
+
+<?php if (defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE === TRUE): ?>
+
+Backtrace:
+<?php	foreach (debug_backtrace() as $error): ?>
+<?php		if (isset($error['file']) && strpos($error['file'], realpath(BASEPATH)) !== 0): ?>
+	File: <?php echo $error['file'], "\n"; ?>
+	Line: <?php echo $error['line'], "\n"; ?>
+	Function: <?php echo $error['function'], "\n\n"; ?>
+<?php		endif ?>
+<?php	endforeach ?>
+
+<?php endif ?>
diff --git a/src/application/views/errors/cli/index.html b/src/application/views/errors/cli/index.html
new file mode 100644
index 00000000..b702fbc3
--- /dev/null
+++ b/src/application/views/errors/cli/index.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<title>403 Forbidden</title>
+</head>
+<body>
+
+<p>Directory access is forbidden.</p>
+
+</body>
+</html>
diff --git a/src/application/errors/error_404.php b/src/application/views/errors/html/error_404.php
similarity index 100%
rename from src/application/errors/error_404.php
rename to src/application/views/errors/html/error_404.php
diff --git a/src/application/errors/error_db.php b/src/application/views/errors/html/error_db.php
similarity index 100%
rename from src/application/errors/error_db.php
rename to src/application/views/errors/html/error_db.php
diff --git a/src/application/views/errors/html/error_exception.php b/src/application/views/errors/html/error_exception.php
new file mode 100644
index 00000000..87848866
--- /dev/null
+++ b/src/application/views/errors/html/error_exception.php
@@ -0,0 +1,32 @@
+<?php
+defined('BASEPATH') OR exit('No direct script access allowed');
+?>
+
+<div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
+
+<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>
+
+<?php if (defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE === TRUE): ?>
+
+	<p>Backtrace:</p>
+	<?php foreach ($exception->getTrace() as $error): ?>
+
+		<?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 ?>
+
+	<?php endforeach ?>
+
+<?php endif ?>
+
+</div>
\ No newline at end of file
diff --git a/src/application/errors/error_general.php b/src/application/views/errors/html/error_general.php
similarity index 100%
rename from src/application/errors/error_general.php
rename to src/application/views/errors/html/error_general.php
diff --git a/src/application/errors/error_php.php b/src/application/views/errors/html/error_php.php
similarity index 100%
rename from src/application/errors/error_php.php
rename to src/application/views/errors/html/error_php.php
diff --git a/src/application/errors/index.html b/src/application/views/errors/html/index.html
similarity index 100%
rename from src/application/errors/index.html
rename to src/application/views/errors/html/index.html