From cb212c6ad80e85b8d41fea6a5bde26e4272dd223 Mon Sep 17 00:00:00 2001 From: MarcosCoelho Date: Wed, 31 Aug 2011 14:59:19 -0300 Subject: fixes some typo --- application/config/routes.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'application/config/routes.php') diff --git a/application/config/routes.php b/application/config/routes.php index 5f9a58343..f30a0d1f2 100644 --- a/application/config/routes.php +++ b/application/config/routes.php @@ -23,7 +23,7 @@ | RESERVED ROUTES | ------------------------------------------------------------------------- | -| There area two reserved routes: +| There are two reserved routes: | | $route['default_controller'] = 'welcome'; | -- cgit v1.2.3-24-g4f1b From f4a4bd8fac188ebc9cda822ffc811c218fd92b45 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Thu, 20 Oct 2011 12:18:42 -0500 Subject: adding new license file (OSL 3.0) and updating readme to ReST added notice of license to all source files. OSL to all except the few files we ship inside of the application folder, those are AFL. Updated license in user guide. incrementing next dev version to 3.0 due to licensing change --- application/config/routes.php | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'application/config/routes.php') diff --git a/application/config/routes.php b/application/config/routes.php index f30a0d1f2..28cc6ca30 100644 --- a/application/config/routes.php +++ b/application/config/routes.php @@ -1,4 +1,30 @@ Date: Fri, 21 Oct 2011 09:55:40 -0500 Subject: fixing typo in attribution block --- application/config/routes.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'application/config/routes.php') diff --git a/application/config/routes.php b/application/config/routes.php index 28cc6ca30..b7f4056a5 100644 --- a/application/config/routes.php +++ b/application/config/routes.php @@ -8,7 +8,7 @@ * * Licensed under the Academic Free License version 3.0 * - * This source file is subject to the Open Software License (OSL 3.0) that is + * 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 -- cgit v1.2.3-24-g4f1b From 0defe5d33ee2633f377a109519ca818becc60f64 Mon Sep 17 00:00:00 2001 From: Greg Aker Date: Sun, 1 Jan 2012 18:46:41 -0600 Subject: Updating copyright date to 2012 --- application/config/routes.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'application/config/routes.php') diff --git a/application/config/routes.php b/application/config/routes.php index b7f4056a5..53fc7e799 100644 --- a/application/config/routes.php +++ b/application/config/routes.php @@ -18,7 +18,7 @@ * * @package CodeIgniter * @author EllisLab Dev Team - * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc. (http://ellislab.com/) + * @copyright Copyright (c) 2008 - 2012, 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 -- cgit v1.2.3-24-g4f1b From 07c1ac830b4e98aa40f48baef3dd05fb68c0a836 Mon Sep 17 00:00:00 2001 From: Phil Sturgeon Date: Fri, 9 Mar 2012 17:03:37 +0000 Subject: Bumped CodeIgniter's PHP requirement to 5.2.4. Yes I know PHP 5.4 just came out, and yes I know PHP 5.3 has lovely features, but there are plenty of corporate systems running on CodeIgniter and PHP 5.3 still is not widely supported enough. CodeIgniter is great for distributed applications, and this is the highest we can reasonably go without breaking support. PHP 5.3 will most likely happen in another year or so. Fingers crossed on that one anyway... --- application/config/routes.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'application/config/routes.php') diff --git a/application/config/routes.php b/application/config/routes.php index 53fc7e799..686573deb 100644 --- a/application/config/routes.php +++ b/application/config/routes.php @@ -2,7 +2,7 @@ /** * CodeIgniter * - * An open source application development framework for PHP 5.1.6 or newer + * An open source application development framework for PHP 5.2.4 or newer * * NOTICE OF LICENSE * -- cgit v1.2.3-24-g4f1b From e734b38e0f4cde3ebe17cdb1844faa0129fe8b11 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Mon, 26 Mar 2012 13:42:36 +0300 Subject: Clear some spaces and fix some inconsistencies in application/ php files --- application/config/routes.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'application/config/routes.php') diff --git a/application/config/routes.php b/application/config/routes.php index 686573deb..474bda969 100644 --- a/application/config/routes.php +++ b/application/config/routes.php @@ -1,13 +1,13 @@ - Date: Thu, 17 May 2012 20:41:12 +0100 Subject: Changed the default controller route to use single quotes instead of double quotes --- application/config/routes.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'application/config/routes.php') diff --git a/application/config/routes.php b/application/config/routes.php index 474bda969..001198615 100644 --- a/application/config/routes.php +++ b/application/config/routes.php @@ -64,7 +64,7 @@ | */ -$route['default_controller'] = "welcome"; +$route['default_controller'] = 'welcome'; $route['404_override'] = ''; /* End of file routes.php */ -- cgit v1.2.3-24-g4f1b From 51b7acda68a144d4e6d917f467a53d0299b326dd Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Mon, 29 Oct 2012 16:23:13 +0200 Subject: [ci skip] Clarify explanation of the 404_override setting in application/config/routes.php --- application/config/routes.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'application/config/routes.php') diff --git a/application/config/routes.php b/application/config/routes.php index 001198615..d1a4419b7 100644 --- a/application/config/routes.php +++ b/application/config/routes.php @@ -59,8 +59,8 @@ | | $route['404_override'] = 'errors/page_missing'; | -| This route will tell the Router what URI segments to use if those provided -| in the URL cannot be matched to a valid route. +| This route will tell the Router which controller/method to use if those +| provided in the URL cannot be matched to a valid route. | */ -- cgit v1.2.3-24-g4f1b From 80500afbd188600212ca913a7bac073009feac73 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Tue, 1 Jan 2013 08:16:53 +0200 Subject: [ci skip] Happy new year --- application/config/routes.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'application/config/routes.php') diff --git a/application/config/routes.php b/application/config/routes.php index d1a4419b7..a5047a14e 100644 --- a/application/config/routes.php +++ b/application/config/routes.php @@ -18,7 +18,7 @@ * * @package CodeIgniter * @author EllisLab Dev Team - * @copyright Copyright (c) 2008 - 2012, EllisLab, Inc. (http://ellislab.com/) + * @copyright Copyright (c) 2008 - 2013, 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 -- cgit v1.2.3-24-g4f1b From 08fec7bdf846daa3dfa4114310f065294ac092fc Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Fri, 19 Jul 2013 16:25:51 +0300 Subject: Router improvements - Make dashes-to-underscores URI segment replacement configurable via ['translate_uri_dashes']. - Make _set_routing() protected and move the call to the class constructor. - Remove redudant calls to set_class() and set_method(). - Clean-up/optimize the routes loading procedure. (fixes issue #2503) --- application/config/routes.php | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'application/config/routes.php') diff --git a/application/config/routes.php b/application/config/routes.php index a5047a14e..3078c3c76 100644 --- a/application/config/routes.php +++ b/application/config/routes.php @@ -49,7 +49,7 @@ | RESERVED ROUTES | ------------------------------------------------------------------------- | -| There are two reserved routes: +| There are three reserved routes: | | $route['default_controller'] = 'welcome'; | @@ -62,10 +62,20 @@ | This route will tell the Router which controller/method to use if those | provided in the URL cannot be matched to a valid route. | +| $route['translate_uri_dashes'] = FALSE; +| +| This is not exactly a route, but allows you to automatically route +| controller and method names that contain dashes. '-' isn't a valid +| class or method name character, so it requires translation. +| When you set this option to TRUE, it will replace ALL dashes in the +| controller and method URI segments. +| +| Examples: my-controller/index -> my_controller/index +| my-controller/my-method -> my_controller/my_method */ - $route['default_controller'] = 'welcome'; $route['404_override'] = ''; +$route['translate_uri_dashes'] = FALSE; /* End of file routes.php */ /* Location: ./application/config/routes.php */ \ 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/config/routes.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'application/config/routes.php') diff --git a/application/config/routes.php b/application/config/routes.php index 3078c3c76..cee9a5361 100644 --- a/application/config/routes.php +++ b/application/config/routes.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 1.0 -- cgit v1.2.3-24-g4f1b From d8bef8a878238c6974f01758469af1c13ac8b8d7 Mon Sep 17 00:00:00 2001 From: darwinel Date: Tue, 11 Feb 2014 20:13:22 +0100 Subject: "BASEPATH check" consistency MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As described in issue #2870 + A change in the „How to create a library” example in the user_guide --- application/config/routes.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'application/config/routes.php') diff --git a/application/config/routes.php b/application/config/routes.php index cee9a5361..572f87e35 100644 --- a/application/config/routes.php +++ b/application/config/routes.php @@ -1,4 +1,4 @@ - Date: Tue, 28 Oct 2014 00:13:31 +0200 Subject: [ci skip] Switch to MIT license; close #3293 --- application/config/routes.php | 39 +++++++++++++++++++++++++-------------- 1 file changed, 25 insertions(+), 14 deletions(-) (limited to 'application/config/routes.php') diff --git a/application/config/routes.php b/application/config/routes.php index 572f87e35..a151efbc3 100644 --- a/application/config/routes.php +++ b/application/config/routes.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 1.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 1.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/config/routes.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'application/config/routes.php') diff --git a/application/config/routes.php b/application/config/routes.php index a151efbc3..b5fd8a0d2 100644 --- a/application/config/routes.php +++ b/application/config/routes.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 1.0.0 -- cgit v1.2.3-24-g4f1b From 4cbe463b4c442e0e2dae2f43565e77f7ac5ecb86 Mon Sep 17 00:00:00 2001 From: vlakoff Date: Wed, 21 Jan 2015 22:56:22 +0100 Subject: Remove closing blocks at end of PHP files --- application/config/routes.php | 3 --- 1 file changed, 3 deletions(-) (limited to 'application/config/routes.php') diff --git a/application/config/routes.php b/application/config/routes.php index b5fd8a0d2..6b2bf71a9 100644 --- a/application/config/routes.php +++ b/application/config/routes.php @@ -88,6 +88,3 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $route['default_controller'] = 'welcome'; $route['404_override'] = ''; $route['translate_uri_dashes'] = FALSE; - -/* End of file routes.php */ -/* Location: ./application/config/routes.php */ \ No newline at end of file -- 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/config/routes.php | 36 ------------------------------------ 1 file changed, 36 deletions(-) (limited to 'application/config/routes.php') diff --git a/application/config/routes.php b/application/config/routes.php index 6b2bf71a9..a98c6d122 100644 --- a/application/config/routes.php +++ b/application/config/routes.php @@ -1,40 +1,4 @@ Date: Mon, 11 Jan 2016 12:50:18 +0200 Subject: [ci skip] Update codeigniter.com links to https --- application/config/routes.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'application/config/routes.php') diff --git a/application/config/routes.php b/application/config/routes.php index a98c6d122..1b45740d7 100644 --- a/application/config/routes.php +++ b/application/config/routes.php @@ -19,7 +19,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); | | Please see the user guide for complete details: | -| http://codeigniter.com/user_guide/general/routing.html +| https://codeigniter.com/user_guide/general/routing.html | | ------------------------------------------------------------------------- | RESERVED ROUTES -- cgit v1.2.3-24-g4f1b From 19f0aab3221dd7760387cbec745c1eca9b215af7 Mon Sep 17 00:00:00 2001 From: Florian Pritz Date: Sat, 9 Sep 2017 16:08:00 +0200 Subject: WIP: CI3 migration Signed-off-by: Florian Pritz --- application/config/routes.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'application/config/routes.php') diff --git a/application/config/routes.php b/application/config/routes.php index 896d9d63f..1accd7b95 100644 --- a/application/config/routes.php +++ b/application/config/routes.php @@ -49,12 +49,12 @@ defined('BASEPATH') OR exit('No direct script access allowed'); | Examples: my-controller/index -> my_controller/index | my-controller/my-method -> my_controller/my_method */ -$route['default_controller'] = "file/file_default"; +$route['default_controller'] = "main"; $route['user/(:any)'] = "user/$1"; $route['file/multipaste/(:any)'] = "file/multipaste/$1"; $route['file/(:any)'] = "file/file_default/$1"; $route['tools/(:any)'] = "tools/$1"; -$route['api/(:any)'] = "api/route/$1"; -$route['(:any)'] = "file/file_default/index/$1"; +$route['api/(.+)'] = "api/route/$1"; +$route['(.+)'] = "file/file_default/index/$1"; $route['404_override'] = ''; $route['translate_uri_dashes'] = FALSE; -- cgit v1.2.3-24-g4f1b From ccca699ba61bad35afea2bb6f7881d301ad05709 Mon Sep 17 00:00:00 2001 From: Florian Pritz Date: Mon, 18 Sep 2017 12:14:21 +0200 Subject: Fix some routes Signed-off-by: Florian Pritz --- application/config/routes.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'application/config/routes.php') diff --git a/application/config/routes.php b/application/config/routes.php index 1accd7b95..10d752071 100644 --- a/application/config/routes.php +++ b/application/config/routes.php @@ -52,9 +52,9 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $route['default_controller'] = "main"; $route['user/(:any)'] = "user/$1"; $route['file/multipaste/(:any)'] = "file/multipaste/$1"; -$route['file/(:any)'] = "file/file_default/$1"; -$route['tools/(:any)'] = "tools/$1"; +$route['file/(.+)'] = "main/$1"; +$route['tools/(.+)'] = "tools/$1"; $route['api/(.+)'] = "api/route/$1"; -$route['(.+)'] = "file/file_default/index/$1"; +$route['(.+)'] = "main/index/$1"; $route['404_override'] = ''; $route['translate_uri_dashes'] = FALSE; -- cgit v1.2.3-24-g4f1b From ab58703f61b1d0573444e357840d38533fb1ee85 Mon Sep 17 00:00:00 2001 From: Florian Pritz Date: Thu, 21 Sep 2017 11:31:56 +0200 Subject: Fix additional routes for CI3 Signed-off-by: Florian Pritz --- application/config/routes.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'application/config/routes.php') diff --git a/application/config/routes.php b/application/config/routes.php index 10d752071..4e4d8c71e 100644 --- a/application/config/routes.php +++ b/application/config/routes.php @@ -50,8 +50,8 @@ defined('BASEPATH') OR exit('No direct script access allowed'); | my-controller/my-method -> my_controller/my_method */ $route['default_controller'] = "main"; -$route['user/(:any)'] = "user/$1"; -$route['file/multipaste/(:any)'] = "file/multipaste/$1"; +$route['user/(.+)'] = "user/$1"; +$route['file/multipaste/(.+)'] = "file/multipaste/$1"; $route['file/(.+)'] = "main/$1"; $route['tools/(.+)'] = "tools/$1"; $route['api/(.+)'] = "api/route/$1"; -- cgit v1.2.3-24-g4f1b