From 29947ee882a8d519d62ca9061ed6513cedfb1930 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Tue, 12 Nov 2013 18:36:46 +0200 Subject: Add CLI error templates and only send HTTP status headers for non-CLI requests (issue #1743) --- application/views/errors/cli/error_php.php | 50 ++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 application/views/errors/cli/error_php.php (limited to 'application/views/errors/cli/error_php.php') diff --git a/application/views/errors/cli/error_php.php b/application/views/errors/cli/error_php.php new file mode 100644 index 000000000..4dbc4101c --- /dev/null +++ b/application/views/errors/cli/error_php.php @@ -0,0 +1,50 @@ + + +A PHP Error was encountered + +Severity: +Message: +Filename: +Line Number: + + + +Backtrace: + + + + File: + Line: + Function: + + + + + \ No newline at end of file -- cgit v1.2.3-24-g4f1b From 871754af60251993d640981e107d2def5f2db396 Mon Sep 17 00:00:00 2001 From: darwinel Date: Tue, 11 Feb 2014 17:34:57 +0100 Subject: 2013 > 2014 Update copyright notices from 2013 to 2014. And update one calendar example in user_guide from year 2013/2014 to 2014/2015. --- application/views/errors/cli/error_php.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'application/views/errors/cli/error_php.php') diff --git a/application/views/errors/cli/error_php.php b/application/views/errors/cli/error_php.php index 4dbc4101c..faaddb1cc 100644 --- a/application/views/errors/cli/error_php.php +++ b/application/views/errors/cli/error_php.php @@ -18,7 +18,7 @@ * * @package CodeIgniter * @author EllisLab Dev Team - * @copyright Copyright (c) 2008 - 2013, EllisLab, Inc. (http://ellislab.com/) + * @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 -- cgit v1.2.3-24-g4f1b From bdb96ca1b1dbfc1791172fd169d7751cbc4d7d55 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Tue, 28 Oct 2014 00:13:31 +0200 Subject: [ci skip] Switch to MIT license; close #3293 --- application/views/errors/cli/error_php.php | 39 +++++++++++++++++++----------- 1 file changed, 25 insertions(+), 14 deletions(-) (limited to 'application/views/errors/cli/error_php.php') diff --git a/application/views/errors/cli/error_php.php b/application/views/errors/cli/error_php.php index faaddb1cc..d0325cbcf 100644 --- a/application/views/errors/cli/error_php.php +++ b/application/views/errors/cli/error_php.php @@ -4,24 +4,35 @@ * * An open source application development framework for PHP 5.2.4 or newer * - * NOTICE OF LICENSE + * This content is released under the MIT License (MIT) * - * Licensed under the Academic Free License version 3.0 + * Copyright (c) 2014, British Columbia Institute of Technology * - * 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. + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: * - * @package CodeIgniter - * @author EllisLab Dev Team + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + * @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 + * @copyright Copyright (c) 2014, British Columbia Institute of Technology (http://bcit.ca/) + * @license http://opensource.org/licenses/MIT MIT License + * @link http://codeigniter.com + * @since Version 3.0.0 * @filesource */ defined('BASEPATH') OR exit('No direct script access allowed'); -- cgit v1.2.3-24-g4f1b From fe9309d22c1b088f5363954d6dac013c8c955894 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Fri, 9 Jan 2015 17:48:58 +0200 Subject: Bulk (mostly documentation) update - Remove PHP version from license notices - Bump year number in copyright notices - Recommend PHP 5.4 or newer to be used - Tell Travis-CI to test on PHP 5.3.0 instead of the latest 5.3 version Related: #3450 --- application/views/errors/cli/error_php.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'application/views/errors/cli/error_php.php') diff --git a/application/views/errors/cli/error_php.php b/application/views/errors/cli/error_php.php index d0325cbcf..78aaa9087 100644 --- a/application/views/errors/cli/error_php.php +++ b/application/views/errors/cli/error_php.php @@ -2,11 +2,11 @@ /** * CodeIgniter * - * An open source application development framework for PHP 5.2.4 or newer + * An open source application development framework for PHP * * This content is released under the MIT License (MIT) * - * Copyright (c) 2014, British Columbia Institute of Technology + * Copyright (c) 2014 - 2015, British Columbia Institute of Technology * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -29,7 +29,7 @@ * @package CodeIgniter * @author EllisLab Dev Team * @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. (http://ellislab.com/) - * @copyright Copyright (c) 2014, British Columbia Institute of Technology (http://bcit.ca/) + * @copyright Copyright (c) 2014 - 2015, British Columbia Institute of Technology (http://bcit.ca/) * @license http://opensource.org/licenses/MIT MIT License * @link http://codeigniter.com * @since Version 3.0.0 -- cgit v1.2.3-24-g4f1b From b56de6537e9d9a6156dbeaa325f52d3b6e3792a4 Mon Sep 17 00:00:00 2001 From: vlakoff Date: Thu, 22 Jan 2015 21:27:38 +0100 Subject: Remove license blocks in /application files These blocks are annoying for the user and serve little to no purpose as the files are just config files, a boilerplate controller and some views. --- application/views/errors/cli/error_php.php | 36 ------------------------------ 1 file changed, 36 deletions(-) (limited to 'application/views/errors/cli/error_php.php') diff --git a/application/views/errors/cli/error_php.php b/application/views/errors/cli/error_php.php index 78aaa9087..fec91e54f 100644 --- a/application/views/errors/cli/error_php.php +++ b/application/views/errors/cli/error_php.php @@ -1,40 +1,4 @@ -- cgit v1.2.3-24-g4f1b From 20473fa9612caaa8eba5acbe81110cf1e5b25970 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 18 Jul 2015 10:45:43 +0900 Subject: Fix errors/cli/error_php.php output Signed-off-by: Kenji Suzuki --- application/views/errors/cli/error_php.php | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) (limited to 'application/views/errors/cli/error_php.php') diff --git a/application/views/errors/cli/error_php.php b/application/views/errors/cli/error_php.php index fec91e54f..ed181a887 100644 --- a/application/views/errors/cli/error_php.php +++ b/application/views/errors/cli/error_php.php @@ -4,22 +4,20 @@ defined('BASEPATH') OR exit('No direct script access allowed'); A PHP Error was encountered -Severity: -Message: -Filename: +Severity: +Message: +Filename: Line Number: Backtrace: - - + + + File: + Line: + Function: + + - File: - Line: - Function: - - - - - \ No newline at end of file + -- cgit v1.2.3-24-g4f1b From 11fdc643f5125ed1e2bb0009e423332c717f707a Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 20 Jul 2015 20:34:39 +0900 Subject: Fix indentation Signed-off-by: Kenji Suzuki --- application/views/errors/cli/error_php.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'application/views/errors/cli/error_php.php') diff --git a/application/views/errors/cli/error_php.php b/application/views/errors/cli/error_php.php index ed181a887..d977f8464 100644 --- a/application/views/errors/cli/error_php.php +++ b/application/views/errors/cli/error_php.php @@ -12,12 +12,12 @@ Line Number: Backtrace: - - + + File: Line: Function: - - + + -- cgit v1.2.3-24-g4f1b From 58f7cc999223e2094b3990dd7aa349761fd04009 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Mon, 20 Jul 2015 14:44:40 +0300 Subject: [ci skip] Apply changes from PR #3983 to error_exception.php --- application/views/errors/cli/error_php.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'application/views/errors/cli/error_php.php') diff --git a/application/views/errors/cli/error_php.php b/application/views/errors/cli/error_php.php index d977f8464..0ea9109fa 100644 --- a/application/views/errors/cli/error_php.php +++ b/application/views/errors/cli/error_php.php @@ -1,6 +1,4 @@ - + A PHP Error was encountered -- cgit v1.2.3-24-g4f1b From 3d30c69bbdba55aa85def9355a0fa3135e06ad61 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 21 Jul 2015 08:15:34 +0900 Subject: Fix coding style Signed-off-by: Kenji Suzuki --- application/views/errors/cli/error_php.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'application/views/errors/cli/error_php.php') diff --git a/application/views/errors/cli/error_php.php b/application/views/errors/cli/error_php.php index 0ea9109fa..b3af731aa 100644 --- a/application/views/errors/cli/error_php.php +++ b/application/views/errors/cli/error_php.php @@ -2,19 +2,19 @@ A PHP Error was encountered -Severity: -Message: -Filename: -Line Number: +Severity: +Message: +Filename: +Line Number: Backtrace: - File: - Line: - Function: + File: + Line: + Function: -- cgit v1.2.3-24-g4f1b From 1497d4ec5adb8af92d54e1f321cac792bf0bc15e Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 25 Jul 2015 08:57:00 +0900 Subject: Fix alignment Signed-off-by: Kenji Suzuki --- application/views/errors/cli/error_php.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'application/views/errors/cli/error_php.php') diff --git a/application/views/errors/cli/error_php.php b/application/views/errors/cli/error_php.php index b3af731aa..8a24b6491 100644 --- a/application/views/errors/cli/error_php.php +++ b/application/views/errors/cli/error_php.php @@ -2,9 +2,9 @@ A PHP Error was encountered -Severity: -Message: -Filename: +Severity: +Message: +Filename: Line Number: -- cgit v1.2.3-24-g4f1b