summaryrefslogtreecommitdiffstats
path: root/application
diff options
context:
space:
mode:
authorPhil Sturgeon <email@philsturgeon.co.uk>2010-12-27 20:06:28 +0100
committerPhil Sturgeon <email@philsturgeon.co.uk>2010-12-27 20:06:28 +0100
commitc8089154217307a56b60ae8f0cb85087a1531b27 (patch)
tree18ea049c55438a80d9b3465863ff699063a12304 /application
parent2280e8ea67f94e67f2c803e804fb1b8125b579b0 (diff)
parent5cbe4dd1f0d94791fe86e08111b77c1d57b83f54 (diff)
Implemented GET string support from Dan Horrigan and modified it slightly. Also tweaked his regex_match changes.
Diffstat (limited to 'application')
-rw-r--r--application/config/autoload.php25
-rw-r--r--application/config/config.php39
-rw-r--r--application/config/routes.php9
3 files changed, 48 insertions, 25 deletions
diff --git a/application/config/autoload.php b/application/config/autoload.php
index 5e9740844..90b1a808f 100644
--- a/application/config/autoload.php
+++ b/application/config/autoload.php
@@ -18,16 +18,30 @@
|
| These are the things you can load automatically:
|
-| 1. Libraries
-| 2. Helper files
-| 3. Custom config files
-| 4. Language files
-| 5. Models
+| 1. Packages
+| 2. Libraries
+| 3. Helper files
+| 4. Custom config files
+| 5. Language files
+| 6. Models
|
*/
/*
| -------------------------------------------------------------------
+| Auto-load Packges
+| -------------------------------------------------------------------
+| Prototype:
+|
+| $autoload['packages'] = array(APPPATH.'third_party', '/usr/local/shared');
+|
+*/
+
+$autoload['packages'] = array(APPPATH.'third_party');
+
+
+/*
+| -------------------------------------------------------------------
| Auto-load Libraries
| -------------------------------------------------------------------
| These are the classes located in the system/libraries folder
@@ -98,6 +112,5 @@ $autoload['language'] = array();
$autoload['model'] = array();
-
/* End of file autoload.php */
/* Location: ./application/config/autoload.php */ \ No newline at end of file
diff --git a/application/config/config.php b/application/config/config.php
index 477d7bfc4..a844f71ab 100644
--- a/application/config/config.php
+++ b/application/config/config.php
@@ -10,8 +10,11 @@
|
| http://example.com/
|
+| If this is not set then CodeIgniter will guess the protocol, domain and
+| path to your installation.
+|
*/
-$config['base_url'] = "http://example.com/";
+$config['base_url'] = '';
/*
|--------------------------------------------------------------------------
@@ -23,7 +26,7 @@ $config['base_url'] = "http://example.com/";
| variable so that it is blank.
|
*/
-$config['index_page'] = "index.php";
+$config['index_page'] = 'index.php';
/*
|--------------------------------------------------------------------------
@@ -31,7 +34,7 @@ $config['index_page'] = "index.php";
|--------------------------------------------------------------------------
|
| This item determines which server global should be used to retrieve the
-| URI string. The default setting of "AUTO" works for most servers.
+| URI string. The default setting of 'AUTO' works for most servers.
| If your links do not seem to work, try one of the other delicious flavors:
|
| 'AUTO' Default - auto detects
@@ -41,7 +44,7 @@ $config['index_page'] = "index.php";
| 'ORIG_PATH_INFO' Uses the ORIG_PATH_INFO
|
*/
-$config['uri_protocol'] = "AUTO";
+$config['uri_protocol'] = 'AUTO';
/*
|--------------------------------------------------------------------------
@@ -54,7 +57,7 @@ $config['uri_protocol'] = "AUTO";
| http://codeigniter.com/user_guide/general/urls.html
*/
-$config['url_suffix'] = "";
+$config['url_suffix'] = '';
/*
|--------------------------------------------------------------------------
@@ -66,7 +69,7 @@ $config['url_suffix'] = "";
| than english.
|
*/
-$config['language'] = "english";
+$config['language'] = 'english';
/*
|--------------------------------------------------------------------------
@@ -77,14 +80,14 @@ $config['language'] = "english";
| that require a character set to be provided.
|
*/
-$config['charset'] = "UTF-8";
+$config['charset'] = 'UTF-8';
/*
|--------------------------------------------------------------------------
| Enable/Disable System Hooks
|--------------------------------------------------------------------------
|
-| If you would like to use the "hooks" feature you must enable it by
+| If you would like to use the 'hooks' feature you must enable it by
| setting this variable to TRUE (boolean). See the user guide for details.
|
*/
@@ -142,7 +145,7 @@ $config['permitted_uri_chars'] = 'a-z 0-9~%.:_\-';
|
| Options are: TRUE or FALSE (boolean)
|
-| The other items let you set the query string "words" that will
+| The other items let you set the query string 'words' that will
| invoke your controllers and its functions:
| example.com/index.php?c=controller&m=function
|
@@ -151,7 +154,7 @@ $config['permitted_uri_chars'] = 'a-z 0-9~%.:_\-';
| use segment based URLs.
|
*/
-$config['allow_get_array'] = TRUE;
+$config['allow_get_array'] = TRUE;
$config['enable_query_strings'] = FALSE;
$config['controller_trigger'] = 'c';
$config['function_trigger'] = 'm';
@@ -221,7 +224,7 @@ $config['cache_path'] = '';
| MUST set an encryption key. See the user guide for info.
|
*/
-$config['encryption_key'] = "";
+$config['encryption_key'] = '';
/*
|--------------------------------------------------------------------------
@@ -261,9 +264,9 @@ $config['sess_time_to_update'] = 300;
| 'cookie_path' = Typically will be a forward slash
|
*/
-$config['cookie_prefix'] = "";
-$config['cookie_domain'] = "";
-$config['cookie_path'] = "/";
+$config['cookie_prefix'] = '';
+$config['cookie_domain'] = '';
+$config['cookie_path'] = '/';
/*
|--------------------------------------------------------------------------
@@ -301,7 +304,7 @@ $config['csrf_protection'] = FALSE;
| means you are prematurely outputting something to your browser. It could
| even be a line of whitespace at the end of one of your scripts. For
| compression to work, nothing can be sent before the output buffer is called
-| by the output class. Do not "echo" any values with compression enabled.
+| by the output class. Do not 'echo' any values with compression enabled.
|
*/
$config['compress_output'] = FALSE;
@@ -311,9 +314,9 @@ $config['compress_output'] = FALSE;
| Master Time Reference
|--------------------------------------------------------------------------
|
-| Options are "local" or "gmt". This pref tells the system whether to use
-| your server's local time as the master "now" reference, or convert it to
-| GMT. See the "date helper" page of the user guide for information
+| Options are 'local' or 'gmt'. This pref tells the system whether to use
+| your server's local time as the master 'now' reference, or convert it to
+| GMT. See the 'date helper' page of the user guide for information
| regarding date handling.
|
*/
diff --git a/application/config/routes.php b/application/config/routes.php
index 614462fd9..5f9a58343 100644
--- a/application/config/routes.php
+++ b/application/config/routes.php
@@ -23,16 +23,23 @@
| RESERVED ROUTES
| -------------------------------------------------------------------------
|
-| There is one reserved routes:
+| There area two reserved routes:
|
| $route['default_controller'] = 'welcome';
|
| This route indicates which controller class should be loaded if the
| URI contains no data. In the above example, the "welcome" class
| would be loaded.
+|
+| $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.
+|
*/
$route['default_controller'] = "welcome";
+$route['404_override'] = '';
/* End of file routes.php */