4 files changed, 59 insertions, 126 deletions
diff --git a/application/errors/error_404.php b/application/errors/error_404.php
index 792726a67..cfe923d63 100644
--- a/application/errors/error_404.php
+++ b/application/errors/error_404.php
@@ -1,62 +1,3 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-<title>404 Page Not Found</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 {
-	margin: 12px 15px 12px 15px;
-}
-</style>
-</head>
-<body>
-	<div id="container">
-		<h1><?php echo $heading; ?></h1>
-		<?php echo $message; ?>
-	</div>
-</body>
-</html>
-\ No newline at end of file
+<?php
+$title = "404 Page Not Found";
+include "application/errors/error_general.php";
diff --git a/application/errors/error_db.php b/application/errors/error_db.php
index b396cda9f..255513634 100644
--- a/application/errors/error_db.php
+++ b/application/errors/error_db.php
@@ -1,62 +1,3 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-<title>Database 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 {
-	margin: 12px 15px 12px 15px;
-}
-</style>
-</head>
-<body>
-	<div id="container">
-		<h1><?php echo $heading; ?></h1>
-		<?php echo $message; ?>
-	</div>
-</body>
-</html>
-\ No newline at end of file
+<?php
+$title = "Database Error";
+include "application/errors/error_general.php";
diff --git a/application/errors/error_general.php b/application/errors/error_general.php
index fd63ce2c5..be495e4f6 100644
--- a/application/errors/error_general.php
+++ b/application/errors/error_general.php
@@ -1,3 +1,51 @@
+<?php
+
+// fancy error page only works if we can load helpers
+if (class_exists("CI_Controller") && !isset($GLOBALS["is_error_page"])) {
+	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()) {
+		is_cli_client(true);
+	}
+
+	if (static_storage("response_type") == "json") {
+		$message = str_replace("</p>", "</p>\n", $message);
+		$array = array(
+			"status" => "error",
+			"message" => strip_tags($message),
+		);
+		header('Content-type: application/json');
+		echo json_encode($array);
+		exit();
+	}
+
+	if (is_cli_client()) {
+		$message = str_replace("</p>", "</p>\n", $message);
+		$message = strip_tags($message);
+		echo "$heading: $message\n";
+		exit();
+	}
+
+	include 'application/views/header.php';
+
+	?>
+		<div class="error">
+			<h1><?php echo $heading; ?></h1>
+			<?php echo $message; ?>
+		</div>
+
+	<?php
+	include 'application/views/footer.php';
+} else {
+	// default CI error page
+?>
 <!DOCTYPE html>
 <html lang="en">
 <head>
@@ -59,4 +107,6 @@ p {
 		<?php echo $message; ?>
 	</div>
 </body>
-</html>
-\ No newline at end of file
+</html>
+<?php
+}
diff --git a/application/errors/error_php.php b/application/errors/error_php.php
index f085c2037..5f91e07a0 100644
--- a/application/errors/error_php.php
+++ b/application/errors/error_php.php
@@ -7,4 +7,5 @@
 <p>Filename: <?php echo $filepath; ?></p>
 <p>Line Number: <?php echo $line; ?></p>
 
-</div>
-\ No newline at end of file
+</div>
+<?php exit();