summaryrefslogtreecommitdiffstats
path: root/application
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2014-08-09 18:08:57 +0200
committerFlorian Pritz <bluewind@xinu.at>2014-08-29 17:43:19 +0200
commit3c6b4d9311fb622a5ccf5276a5f551aa9471f803 (patch)
treeadbd1192acaf8ce7982cc50930b46d4583883a89 /application
parentcc72236f71c60396b69631656f8e0ad00a6301c8 (diff)
Display better errors for CLI requests
Signed-off-by: Florian Pritz <bluewind@xinu.at>
Diffstat (limited to 'application')
-rw-r--r--application/errors/error_404.php65
-rw-r--r--application/errors/error_db.php65
-rw-r--r--application/errors/error_general.php10
3 files changed, 15 insertions, 125 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 6c67fa33f..be495e4f6 100644
--- a/application/errors/error_general.php
+++ b/application/errors/error_general.php
@@ -2,14 +2,21 @@
// fancy error page only works if we can load helpers
if (class_exists("CI_Controller") && !isset($GLOBALS["is_error_page"])) {
- $title = "Error";
+ 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),
@@ -20,6 +27,7 @@ if (class_exists("CI_Controller") && !isset($GLOBALS["is_error_page"])) {
}
if (is_cli_client()) {
+ $message = str_replace("</p>", "</p>\n", $message);
$message = strip_tags($message);
echo "$heading: $message\n";
exit();