summaryrefslogtreecommitdiffstats
path: root/application/views/errors
diff options
context:
space:
mode:
Diffstat (limited to 'application/views/errors')
-rw-r--r--application/views/errors/cli/error_404.php25
-rw-r--r--application/views/errors/cli/error_db.php25
-rw-r--r--application/views/errors/cli/error_exception.php25
-rw-r--r--application/views/errors/cli/error_general.php25
-rw-r--r--application/views/errors/cli/error_php.php25
-rw-r--r--application/views/errors/html/error_404.php25
-rw-r--r--application/views/errors/html/error_db.php25
-rw-r--r--application/views/errors/html/error_exception.php32
-rw-r--r--application/views/errors/html/error_general.php25
-rw-r--r--application/views/errors/html/error_php.php25
10 files changed, 57 insertions, 200 deletions
diff --git a/application/views/errors/cli/error_404.php b/application/views/errors/cli/error_404.php
index d9f4aa64d..6984b61e9 100644
--- a/application/views/errors/cli/error_404.php
+++ b/application/views/errors/cli/error_404.php
@@ -1,29 +1,4 @@
<?php
-/**
- * CodeIgniter
- *
- * An open source application development framework for PHP 5.2.4 or newer
- *
- * NOTICE OF LICENSE
- *
- * Licensed under the Academic Free License version 3.0
- *
- * This source file is subject to the Academic Free License (AFL 3.0) that is
- * bundled with this package in the files license_afl.txt / license_afl.rst.
- * It is also available through the world wide web at this URL:
- * http://opensource.org/licenses/AFL-3.0
- * If you did not receive a copy of the license and are unable to obtain it
- * through the world wide web, please send an email to
- * licensing@ellislab.com so we can send you a copy immediately.
- *
- * @package CodeIgniter
- * @author EllisLab Dev Team
- * @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. (http://ellislab.com/)
- * @license http://opensource.org/licenses/AFL-3.0 Academic Free License (AFL 3.0)
- * @link http://codeigniter.com
- * @since Version 3.0
- * @filesource
- */
defined('BASEPATH') OR exit('No direct script access allowed');
echo "\nERROR: ",
diff --git a/application/views/errors/cli/error_db.php b/application/views/errors/cli/error_db.php
index e6d6afd73..2ff43ffc7 100644
--- a/application/views/errors/cli/error_db.php
+++ b/application/views/errors/cli/error_db.php
@@ -1,29 +1,4 @@
<?php
-/**
- * CodeIgniter
- *
- * An open source application development framework for PHP 5.2.4 or newer
- *
- * NOTICE OF LICENSE
- *
- * Licensed under the Academic Free License version 3.0
- *
- * This source file is subject to the Academic Free License (AFL 3.0) that is
- * bundled with this package in the files license_afl.txt / license_afl.rst.
- * It is also available through the world wide web at this URL:
- * http://opensource.org/licenses/AFL-3.0
- * If you did not receive a copy of the license and are unable to obtain it
- * through the world wide web, please send an email to
- * licensing@ellislab.com so we can send you a copy immediately.
- *
- * @package CodeIgniter
- * @author EllisLab Dev Team
- * @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. (http://ellislab.com/)
- * @license http://opensource.org/licenses/AFL-3.0 Academic Free License (AFL 3.0)
- * @link http://codeigniter.com
- * @since Version 3.0
- * @filesource
- */
defined('BASEPATH') OR exit('No direct script access allowed');
echo "\nDatabase error: ",
diff --git a/application/views/errors/cli/error_exception.php b/application/views/errors/cli/error_exception.php
new file mode 100644
index 000000000..75d7f0fad
--- /dev/null
+++ b/application/views/errors/cli/error_exception.php
@@ -0,0 +1,25 @@
+<?php
+defined('BASEPATH') OR exit('No direct script access allowed');
+?>
+
+An uncaught Exception was encountered
+
+Type: <?php echo get_class($exception); ?>
+Message: <?php echo $message; ?>
+Filename: <?php echo $exception->getFile(); ?>
+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']; ?>
+ Line: <?php echo $error['line']; ?>
+ Function: <?php echo $error['function']; ?>
+
+ <?php endif ?>
+
+ <?php endforeach ?>
+<?php endif ?> \ No newline at end of file
diff --git a/application/views/errors/cli/error_general.php b/application/views/errors/cli/error_general.php
index b8a3c6b30..6984b61e9 100644
--- a/application/views/errors/cli/error_general.php
+++ b/application/views/errors/cli/error_general.php
@@ -1,29 +1,4 @@
<?php
-/**
- * CodeIgniter
- *
- * An open source application development framework for PHP 5.2.4 or newer
- *
- * NOTICE OF LICENSE
- *
- * Licensed under the Academic Free License version 3.0
- *
- * This source file is subject to the Academic Free License (AFL 3.0) that is
- * bundled with this package in the files license_afl.txt / license_afl.rst.
- * It is also available through the world wide web at this URL:
- * http://opensource.org/licenses/AFL-3.0
- * If you did not receive a copy of the license and are unable to obtain it
- * through the world wide web, please send an email to
- * licensing@ellislab.com so we can send you a copy immediately.
- *
- * @package CodeIgniter
- * @author EllisLab Dev Team
- * @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. (http://ellislab.com/)
- * @license http://opensource.org/licenses/AFL-3.0 Academic Free License (AFL 3.0)
- * @link http://codeigniter.com
- * @since Version 1.0
- * @filesource
- */
defined('BASEPATH') OR exit('No direct script access allowed');
echo "\nERROR: ",
diff --git a/application/views/errors/cli/error_php.php b/application/views/errors/cli/error_php.php
index faaddb1cc..fec91e54f 100644
--- a/application/views/errors/cli/error_php.php
+++ b/application/views/errors/cli/error_php.php
@@ -1,29 +1,4 @@
<?php
-/**
- * CodeIgniter
- *
- * An open source application development framework for PHP 5.2.4 or newer
- *
- * NOTICE OF LICENSE
- *
- * Licensed under the Academic Free License version 3.0
- *
- * This source file is subject to the Academic Free License (AFL 3.0) that is
- * bundled with this package in the files license_afl.txt / license_afl.rst.
- * It is also available through the world wide web at this URL:
- * http://opensource.org/licenses/AFL-3.0
- * If you did not receive a copy of the license and are unable to obtain it
- * through the world wide web, please send an email to
- * licensing@ellislab.com so we can send you a copy immediately.
- *
- * @package CodeIgniter
- * @author EllisLab Dev Team
- * @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. (http://ellislab.com/)
- * @license http://opensource.org/licenses/AFL-3.0 Academic Free License (AFL 3.0)
- * @link http://codeigniter.com
- * @since Version 3.0
- * @filesource
- */
defined('BASEPATH') OR exit('No direct script access allowed');
?>
diff --git a/application/views/errors/html/error_404.php b/application/views/errors/html/error_404.php
index 76ad84742..d1a9e93e9 100644
--- a/application/views/errors/html/error_404.php
+++ b/application/views/errors/html/error_404.php
@@ -1,29 +1,4 @@
<?php
-/**
- * CodeIgniter
- *
- * An open source application development framework for PHP 5.2.4 or newer
- *
- * NOTICE OF LICENSE
- *
- * Licensed under the Academic Free License version 3.0
- *
- * This source file is subject to the Academic Free License (AFL 3.0) that is
- * bundled with this package in the files license_afl.txt / license_afl.rst.
- * It is also available through the world wide web at this URL:
- * http://opensource.org/licenses/AFL-3.0
- * If you did not receive a copy of the license and are unable to obtain it
- * through the world wide web, please send an email to
- * licensing@ellislab.com so we can send you a copy immediately.
- *
- * @package CodeIgniter
- * @author EllisLab Dev Team
- * @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. (http://ellislab.com/)
- * @license http://opensource.org/licenses/AFL-3.0 Academic Free License (AFL 3.0)
- * @link http://codeigniter.com
- * @since Version 1.0
- * @filesource
- */
defined('BASEPATH') OR exit('No direct script access allowed');
?><!DOCTYPE html>
<html lang="en">
diff --git a/application/views/errors/html/error_db.php b/application/views/errors/html/error_db.php
index edf73a6cc..b7df94d2b 100644
--- a/application/views/errors/html/error_db.php
+++ b/application/views/errors/html/error_db.php
@@ -1,29 +1,4 @@
<?php
-/**
- * CodeIgniter
- *
- * An open source application development framework for PHP 5.2.4 or newer
- *
- * NOTICE OF LICENSE
- *
- * Licensed under the Academic Free License version 3.0
- *
- * This source file is subject to the Academic Free License (AFL 3.0) that is
- * bundled with this package in the files license_afl.txt / license_afl.rst.
- * It is also available through the world wide web at this URL:
- * http://opensource.org/licenses/AFL-3.0
- * If you did not receive a copy of the license and are unable to obtain it
- * through the world wide web, please send an email to
- * licensing@ellislab.com so we can send you a copy immediately.
- *
- * @package CodeIgniter
- * @author EllisLab Dev Team
- * @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. (http://ellislab.com/)
- * @license http://opensource.org/licenses/AFL-3.0 Academic Free License (AFL 3.0)
- * @link http://codeigniter.com
- * @since Version 1.0
- * @filesource
- */
defined('BASEPATH') OR exit('No direct script access allowed');
?><!DOCTYPE html>
<html lang="en">
diff --git a/application/views/errors/html/error_exception.php b/application/views/errors/html/error_exception.php
new file mode 100644
index 000000000..87848866a
--- /dev/null
+++ b/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/application/views/errors/html/error_general.php b/application/views/errors/html/error_general.php
index 250ef6223..821815de2 100644
--- a/application/views/errors/html/error_general.php
+++ b/application/views/errors/html/error_general.php
@@ -1,29 +1,4 @@
<?php
-/**
- * CodeIgniter
- *
- * An open source application development framework for PHP 5.2.4 or newer
- *
- * NOTICE OF LICENSE
- *
- * Licensed under the Academic Free License version 3.0
- *
- * This source file is subject to the Academic Free License (AFL 3.0) that is
- * bundled with this package in the files license_afl.txt / license_afl.rst.
- * It is also available through the world wide web at this URL:
- * http://opensource.org/licenses/AFL-3.0
- * If you did not receive a copy of the license and are unable to obtain it
- * through the world wide web, please send an email to
- * licensing@ellislab.com so we can send you a copy immediately.
- *
- * @package CodeIgniter
- * @author EllisLab Dev Team
- * @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. (http://ellislab.com/)
- * @license http://opensource.org/licenses/AFL-3.0 Academic Free License (AFL 3.0)
- * @link http://codeigniter.com
- * @since Version 1.0
- * @filesource
- */
defined('BASEPATH') OR exit('No direct script access allowed');
?><!DOCTYPE html>
<html lang="en">
diff --git a/application/views/errors/html/error_php.php b/application/views/errors/html/error_php.php
index a9fafe5fc..b146f9c5b 100644
--- a/application/views/errors/html/error_php.php
+++ b/application/views/errors/html/error_php.php
@@ -1,29 +1,4 @@
<?php
-/**
- * CodeIgniter
- *
- * An open source application development framework for PHP 5.2.4 or newer
- *
- * NOTICE OF LICENSE
- *
- * Licensed under the Academic Free License version 3.0
- *
- * This source file is subject to the Academic Free License (AFL 3.0) that is
- * bundled with this package in the files license_afl.txt / license_afl.rst.
- * It is also available through the world wide web at this URL:
- * http://opensource.org/licenses/AFL-3.0
- * If you did not receive a copy of the license and are unable to obtain it
- * through the world wide web, please send an email to
- * licensing@ellislab.com so we can send you a copy immediately.
- *
- * @package CodeIgniter
- * @author EllisLab Dev Team
- * @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. (http://ellislab.com/)
- * @license http://opensource.org/licenses/AFL-3.0 Academic Free License (AFL 3.0)
- * @link http://codeigniter.com
- * @since Version 1.0
- * @filesource
- */
defined('BASEPATH') OR exit('No direct script access allowed');
?>