From 02a16129a23409af956392a5a36755489290a2e8 Mon Sep 17 00:00:00 2001 From: brenjt Date: Sat, 14 Sep 2013 11:10:25 -0600 Subject: Updated config to include list of valid characters to `sess_cookie_name` Added list of valid characters to sess_cookie_name --- application/config/config.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'application/config') diff --git a/application/config/config.php b/application/config/config.php index 0608348c6..3114f417b 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -282,7 +282,7 @@ $config['encryption_key'] = ''; | 'sess_driver' = the driver to load: cookie (Classic), native (PHP sessions), | or your custom driver name | 'sess_valid_drivers' = additional valid drivers which may be loaded -| 'sess_cookie_name' = the name you want for the cookie +| 'sess_cookie_name' = the name you want for the cookie, must contain only [0-9a-z_-] characters | 'sess_expiration' = the number of SECONDS you want the session to last. | by default sessions last 7200 seconds (two hours). Set to zero for no expiration. | 'sess_expire_on_close' = Whether to cause the session to expire automatically @@ -435,4 +435,4 @@ $config['proxy_ips'] = ''; /* End of file config.php */ -/* Location: ./application/config/config.php */ \ No newline at end of file +/* Location: ./application/config/config.php */ -- cgit v1.2.3-24-g4f1b From 9c98991705432d9c179715bc7f3b4fb0c6d51b4b Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Sat, 14 Sep 2013 20:55:12 +0300 Subject: [ci skip] Remove empty line at application/config/config.php EOF --- application/config/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'application/config') diff --git a/application/config/config.php b/application/config/config.php index 3114f417b..8d08a7401 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -435,4 +435,4 @@ $config['proxy_ips'] = ''; /* End of file config.php */ -/* Location: ./application/config/config.php */ +/* Location: ./application/config/config.php */ \ No newline at end of file -- cgit v1.2.3-24-g4f1b From 130b055d085bb0a01fa3dcfd9ffba3125c6bd2d0 Mon Sep 17 00:00:00 2001 From: vkeranov Date: Fri, 20 Sep 2013 17:51:38 +0300 Subject: Update mimes.php Added mime type for tar.Z archives --- application/config/mimes.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'application/config') diff --git a/application/config/mimes.php b/application/config/mimes.php index 32d10f6c1..0a6b9006a 100644 --- a/application/config/mimes.php +++ b/application/config/mimes.php @@ -78,6 +78,7 @@ return array( 'sit' => 'application/x-stuffit', 'tar' => 'application/x-tar', 'tgz' => array('application/x-tar', 'application/x-gzip-compressed'), + 'z' => 'application/x-compress', 'xhtml' => 'application/xhtml+xml', 'xht' => 'application/xhtml+xml', 'zip' => array('application/x-zip', 'application/zip', 'application/x-zip-compressed', 'application/s-compressed', 'multipart/x-zip'), @@ -176,4 +177,4 @@ return array( ); /* End of file mimes.php */ -/* Location: ./application/config/mimes.php */ \ No newline at end of file +/* Location: ./application/config/mimes.php */ -- cgit v1.2.3-24-g4f1b From 461acc4b5eee836b99466107e40d7dd59b13e12d Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Sat, 21 Sep 2013 13:43:09 +0300 Subject: [ci skip] Remove an EOF empty line --- application/config/mimes.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'application/config') diff --git a/application/config/mimes.php b/application/config/mimes.php index 0a6b9006a..ad3602126 100644 --- a/application/config/mimes.php +++ b/application/config/mimes.php @@ -177,4 +177,4 @@ return array( ); /* End of file mimes.php */ -/* Location: ./application/config/mimes.php */ +/* Location: ./application/config/mimes.php */ \ No newline at end of file -- cgit v1.2.3-24-g4f1b From 0760a44871e1d0d5dd54d70baa7f8f7129fbdb34 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Mon, 23 Sep 2013 13:59:46 +0300 Subject: [ci skip] Remove some whitespaces --- application/config/constants.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'application/config') diff --git a/application/config/constants.php b/application/config/constants.php index dc84712cd..e71097b6c 100644 --- a/application/config/constants.php +++ b/application/config/constants.php @@ -81,11 +81,11 @@ define('SHOW_DEBUG_BACKTRACE', TRUE); | Used to indicate the conditions under which the script is exit()ing. | While there is no universal standard for error codes, there are some | broad conventions. Three such conventions are mentioned below, for -| those who wish to make use of them. The CodeIgniter defaults were +| those who wish to make use of them. The CodeIgniter defaults were | chosen for the least overlap with these conventions, while still | leaving room for others to be defined in future versions and user | applications. -| +| | The three main conventions used for determining exit status codes | are as follows: | @@ -108,7 +108,6 @@ define('EXIT_USER_INPUT', 7); // invalid user input define('EXIT_DATABASE', 8); // database error define('EXIT__AUTO_MIN', 9); // lowest automatically-assigned error code define('EXIT__AUTO_MAX', 125); // highest automatically-assigned error code - /* End of file constants.php */ /* Location: ./application/config/constants.php */ \ No newline at end of file -- cgit v1.2.3-24-g4f1b From 3751517a5caf9299072248534577f66f9db9221d Mon Sep 17 00:00:00 2001 From: Dmitry Babenko Date: Fri, 4 Oct 2013 14:46:40 +0300 Subject: Exra bmp mimes Mimies source http://filext.com/file-extension/BMP --- application/config/mimes.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'application/config') diff --git a/application/config/mimes.php b/application/config/mimes.php index ad3602126..99b1c4b7d 100644 --- a/application/config/mimes.php +++ b/application/config/mimes.php @@ -97,7 +97,7 @@ return array( 'ra' => 'audio/x-realaudio', 'rv' => 'video/vnd.rn-realvideo', 'wav' => array('audio/x-wav', 'audio/wave', 'audio/wav'), - 'bmp' => array('image/bmp', 'image/x-windows-bmp'), + 'bmp' => array('image/bmp', 'image/x-bmp', 'image/x-bitmap', 'image/x-xbitmap', 'image/x-win-bitmap', 'image/x-windows-bmp', 'image/ms-bmp', 'image/x-ms-bmp', 'application/bmp', 'application/x-bmp', 'application/x-win-bitmap'), 'gif' => 'image/gif', 'jpeg' => array('image/jpeg', 'image/pjpeg'), 'jpg' => array('image/jpeg', 'image/pjpeg'), @@ -177,4 +177,4 @@ return array( ); /* End of file mimes.php */ -/* Location: ./application/config/mimes.php */ \ No newline at end of file +/* Location: ./application/config/mimes.php */ -- cgit v1.2.3-24-g4f1b From 024105034909b189ad995ca01aadcefc510ce144 Mon Sep 17 00:00:00 2001 From: Jcchemin Date: Tue, 8 Oct 2013 18:18:54 +0200 Subject: Update user_agents.php Add detection for Opera 16 --- application/config/user_agents.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'application/config') diff --git a/application/config/user_agents.php b/application/config/user_agents.php index 5887a15be..9177f3e61 100644 --- a/application/config/user_agents.php +++ b/application/config/user_agents.php @@ -81,6 +81,7 @@ $platforms = array( // The order of this array should NOT be changed. Many browsers return // multiple browser types so we want to identify the sub-type first. $browsers = array( + 'OPR' => 'Opera', 'Flock' => 'Flock', 'Chrome' => 'Chrome', 'Opera' => 'Opera', @@ -222,4 +223,4 @@ $robots = array( ); /* End of file user_agents.php */ -/* Location: ./application/config/user_agents.php */ \ No newline at end of file +/* Location: ./application/config/user_agents.php */ -- cgit v1.2.3-24-g4f1b From 9f417d070916e82309a762639cc344445601156b Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Mon, 14 Oct 2013 12:24:36 +0300 Subject: Fix #2682 --- application/config/mimes.php | 2 +- application/config/user_agents.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'application/config') diff --git a/application/config/mimes.php b/application/config/mimes.php index 99b1c4b7d..27d4b2514 100644 --- a/application/config/mimes.php +++ b/application/config/mimes.php @@ -177,4 +177,4 @@ return array( ); /* End of file mimes.php */ -/* Location: ./application/config/mimes.php */ +/* Location: ./application/config/mimes.php */ \ No newline at end of file diff --git a/application/config/user_agents.php b/application/config/user_agents.php index 9177f3e61..899e96a94 100644 --- a/application/config/user_agents.php +++ b/application/config/user_agents.php @@ -223,4 +223,4 @@ $robots = array( ); /* End of file user_agents.php */ -/* Location: ./application/config/user_agents.php */ +/* Location: ./application/config/user_agents.php */ \ No newline at end of file -- cgit v1.2.3-24-g4f1b From fdd1461d98d2b28af282ea676e85a656341f02f3 Mon Sep 17 00:00:00 2001 From: vkeranov Date: Fri, 8 Nov 2013 09:19:29 +0200 Subject: Update user_agents.php Added Ubuntu Web Browser. More info here: http://www.omgubuntu.co.uk/2013/11/ubuntu-touch-browser-finally-given-unique-user-agent-string --- application/config/user_agents.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'application/config') diff --git a/application/config/user_agents.php b/application/config/user_agents.php index 899e96a94..0686bf972 100644 --- a/application/config/user_agents.php +++ b/application/config/user_agents.php @@ -104,7 +104,8 @@ $browsers = array( 'hotjava' => 'HotJava', 'amaya' => 'Amaya', 'IBrowse' => 'IBrowse', - 'Maxthon' => 'Maxthon' + 'Maxthon' => 'Maxthon', + 'Ubuntu' => 'Ubuntu Web Browser' ); $mobiles = array( @@ -223,4 +224,4 @@ $robots = array( ); /* End of file user_agents.php */ -/* Location: ./application/config/user_agents.php */ \ No newline at end of file +/* Location: ./application/config/user_agents.php */ -- cgit v1.2.3-24-g4f1b From c761a206def7714d18623d46b05adc2bbeedce21 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Mon, 11 Nov 2013 14:02:15 +0200 Subject: Polish changes from PR #2712 --- application/config/user_agents.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'application/config') diff --git a/application/config/user_agents.php b/application/config/user_agents.php index 0686bf972..0953deafd 100644 --- a/application/config/user_agents.php +++ b/application/config/user_agents.php @@ -224,4 +224,4 @@ $robots = array( ); /* End of file user_agents.php */ -/* Location: ./application/config/user_agents.php */ +/* Location: ./application/config/user_agents.php */ \ No newline at end of file -- cgit v1.2.3-24-g4f1b From c8c260f98e9bd9b2e5bd8b437c5060367c641a28 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Wed, 27 Nov 2013 13:58:52 +0200 Subject: [ci skip] Remove 2 spaces --- application/config/migration.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'application/config') diff --git a/application/config/migration.php b/application/config/migration.php index b348fb317..a7576cae9 100644 --- a/application/config/migration.php +++ b/application/config/migration.php @@ -105,7 +105,7 @@ $config['migration_version'] = 0; | Also, writing permission is required within the migrations path. | */ -$config['migration_path'] = APPPATH . 'migrations/'; +$config['migration_path'] = APPPATH.'migrations/'; /* End of file migration.php */ /* Location: ./application/config/migration.php */ \ No newline at end of file -- cgit v1.2.3-24-g4f1b From 303c7b28c81fef11cc825e215b146f17318d4c04 Mon Sep 17 00:00:00 2001 From: Andre Gardiner Date: Thu, 5 Dec 2013 22:00:32 -0500 Subject: Update user_agents.php Added Win 8.1 user agent to the array --- application/config/user_agents.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'application/config') diff --git a/application/config/user_agents.php b/application/config/user_agents.php index 0953deafd..3dbf987e0 100644 --- a/application/config/user_agents.php +++ b/application/config/user_agents.php @@ -36,6 +36,7 @@ */ $platforms = array( + 'windows nt 6.3' => 'Windows 8.1', 'windows nt 6.2' => 'Windows 8', 'windows nt 6.1' => 'Windows 7', 'windows nt 6.0' => 'Windows Vista', @@ -224,4 +225,4 @@ $robots = array( ); /* End of file user_agents.php */ -/* Location: ./application/config/user_agents.php */ \ No newline at end of file +/* Location: ./application/config/user_agents.php */ -- cgit v1.2.3-24-g4f1b From a6eae87d14efe3169156a12ad3706852ff70e2c4 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Fri, 3 Jan 2014 18:25:20 +0200 Subject: [ci skip] Some spaces & docblock fixes --- application/config/user_agents.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'application/config') diff --git a/application/config/user_agents.php b/application/config/user_agents.php index 3dbf987e0..e555d77c6 100644 --- a/application/config/user_agents.php +++ b/application/config/user_agents.php @@ -225,4 +225,4 @@ $robots = array( ); /* End of file user_agents.php */ -/* Location: ./application/config/user_agents.php */ +/* Location: ./application/config/user_agents.php */ \ No newline at end of file -- cgit v1.2.3-24-g4f1b From bfb635b276d880336db795f1a603de66ccfc80f6 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Wed, 8 Jan 2014 18:32:05 +0200 Subject: Make newline standardization configurable Added ['standardize_newlines'] Also altered the Session cookie driver, which experienced issues with this feature due to it's HMAC verification failing after the Input class alters newlines in non-encrypted session cookies. Supersedes PR #2470 --- application/config/config.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'application/config') diff --git a/application/config/config.php b/application/config/config.php index 8d08a7401..cd2ca479b 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -325,6 +325,20 @@ $config['cookie_path'] = '/'; $config['cookie_secure'] = FALSE; $config['cookie_httponly'] = FALSE; +/* +|-------------------------------------------------------------------------- +| Standardize newlines +|-------------------------------------------------------------------------- +| +| Determines whether to standardize newline characters in input data, +| meaning to replace \r\n, \r, \n occurences with the PHP_EOL value. +| +| This is particularly useful for portability between UNIX-based OSes, +| (usually \n) and Windows (\r\n). +| +*/ +$config['standardize_newlines'] = TRUE; + /* |-------------------------------------------------------------------------- | Global XSS Filtering -- cgit v1.2.3-24-g4f1b From 10925d27adac84634cc527d7298b1add0d54ba7c Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Thu, 9 Jan 2014 00:16:46 +0200 Subject: Remove preg_quote() call from CI_User_agent::_set_browser() and add another pattern for Opera Input comes from a configuration file that is barely touched by anyone and the default values only contain letters, so it is safe to not quote them. This enables us to add a more advanced pattern in config/user_agents.php for Opera 10+, which ... quote: Opera/9.80 is hard coded at the beginning of the user agent string because of broken browser sniffing scripts which detect 'Opera/10' and above as Opera 1. (reference: http://my.opera.com/community/openweb/idopera/) Instead, latests versions of Opera append ' Version/' to the end of the user agent string. Fixes issue #555 (incorrect browser detection for Opera) --- application/config/user_agents.php | 2 ++ 1 file changed, 2 insertions(+) (limited to 'application/config') diff --git a/application/config/user_agents.php b/application/config/user_agents.php index e555d77c6..2af70bf9c 100644 --- a/application/config/user_agents.php +++ b/application/config/user_agents.php @@ -85,6 +85,8 @@ $browsers = array( 'OPR' => 'Opera', 'Flock' => 'Flock', 'Chrome' => 'Chrome', + // Opera 10+ always reports Opera/9.80 and appends Version/ to the user agent string + 'Opera.*?Version' => 'Opera', 'Opera' => 'Opera', 'MSIE' => 'Internet Explorer', 'Internet Explorer' => 'Internet Explorer', -- cgit v1.2.3-24-g4f1b From 155ee7231c0ef72dc362c7d6423b2e4600024d3c Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Fri, 10 Jan 2014 15:50:54 +0200 Subject: Compress output before storing it to cache, if output compression is enabled Based on PR #964 --- application/config/config.php | 3 +++ 1 file changed, 3 insertions(+) (limited to 'application/config') diff --git a/application/config/config.php b/application/config/config.php index cd2ca479b..c46839330 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -381,6 +381,9 @@ $config['csrf_exclude_uris'] = array(); | Even if it does, however, not all browsers support compression | so enable only if you are reasonably sure your visitors can handle it. | +| Only used if zlib.output_compression is turned off in your php.ini. +| Please do not use it together with httpd-level output compression. +| | VERY IMPORTANT: If you are getting a blank page when compression is enabled it | 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 -- cgit v1.2.3-24-g4f1b From 0c234d06d24294b57c3c25474e6486a22324e59c Mon Sep 17 00:00:00 2001 From: Dionysis Arvanitis Date: Sat, 11 Jan 2014 17:41:23 +0200 Subject: IE11 User Agent support added --- application/config/user_agents.php | 1 + 1 file changed, 1 insertion(+) (limited to 'application/config') diff --git a/application/config/user_agents.php b/application/config/user_agents.php index 2af70bf9c..a5d132904 100644 --- a/application/config/user_agents.php +++ b/application/config/user_agents.php @@ -90,6 +90,7 @@ $browsers = array( 'Opera' => 'Opera', 'MSIE' => 'Internet Explorer', 'Internet Explorer' => 'Internet Explorer', + 'rv' => 'Internet Explorer', 'Shiira' => 'Shiira', 'Firefox' => 'Firefox', 'Chimera' => 'Chimera', -- cgit v1.2.3-24-g4f1b From de14aa5a29b1b122bfd536f979dfda7f2fd9f53d Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Wed, 15 Jan 2014 15:51:08 +0200 Subject: CI_URI changes related to the 'permitted_uri_chars' setting - Initialize and cache the value in the class constructor instead of searching for it every time - Removed the preg_quote() call from _filter_uri() to allow more fine-tuning from configuration - Renamed _filter_uri() to filter_uri() - it was public anyway and using it cannot break anything Related: issue #2799 --- application/config/config.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'application/config') diff --git a/application/config/config.php b/application/config/config.php index cd2ca479b..5240f6c26 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -141,15 +141,18 @@ $config['subclass_prefix'] = 'MY_'; | Allowed URL Characters |-------------------------------------------------------------------------- | -| This lets you specify with a regular expression which characters are permitted -| within your URLs. When someone tries to submit a URL with disallowed -| characters they will get a warning message. +| This lets you specify which characters are permitted within your URLs. +| When someone tries to submit a URL with disallowed characters they will +| get a warning message. | | As a security measure you are STRONGLY encouraged to restrict URLs to | as few characters as possible. By default only these are allowed: a-z 0-9~%.:_- | | Leave blank to allow all characters -- but only if you are insane. | +| The configured value is actually a regular expression character group +| and it will be executed as: ! preg_match('/^[]+$/i +| | DO NOT CHANGE THIS UNLESS YOU FULLY UNDERSTAND THE REPERCUSSIONS!! | */ -- cgit v1.2.3-24-g4f1b From 2cdd50e98373327c72f6a38ba1016abafe496018 Mon Sep 17 00:00:00 2001 From: Dionysis Arvanitis Date: Wed, 15 Jan 2014 16:24:15 +0200 Subject: Trident prefix added to avoid potential false positives. --- application/config/user_agents.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'application/config') diff --git a/application/config/user_agents.php b/application/config/user_agents.php index a5d132904..819e42b69 100644 --- a/application/config/user_agents.php +++ b/application/config/user_agents.php @@ -90,7 +90,7 @@ $browsers = array( 'Opera' => 'Opera', 'MSIE' => 'Internet Explorer', 'Internet Explorer' => 'Internet Explorer', - 'rv' => 'Internet Explorer', + 'Trident.* rv' => 'Internet Explorer', 'Shiira' => 'Shiira', 'Firefox' => 'Firefox', 'Chimera' => 'Chimera', -- cgit v1.2.3-24-g4f1b From 88cf55bd294e74c71e70406e3a48e722db224f7f Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Fri, 17 Jan 2014 15:38:30 +0200 Subject: Add autoloading library aliasing support (supersedes PR #2824) --- application/config/autoload.php | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'application/config') diff --git a/application/config/autoload.php b/application/config/autoload.php index 5a20c943a..43d53155b 100644 --- a/application/config/autoload.php +++ b/application/config/autoload.php @@ -77,6 +77,11 @@ $autoload['packages'] = array(); | Prototype: | | $autoload['libraries'] = array('database', 'email', 'xmlrpc'); +| +| You can also supply an alternative library name to be assigned +| in the controller: +| +| $autoload['libraries'] = array('user_agent' => 'ua'); */ $autoload['libraries'] = array(); -- cgit v1.2.3-24-g4f1b From 4b9b5074c5f4ecc4cc0494acfe26379f9a6d4317 Mon Sep 17 00:00:00 2001 From: Ahmedul Haque Abid Date: Sun, 19 Jan 2014 13:23:16 +0600 Subject: Added save_queries config setting in config/database.php --- application/config/database.php | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'application/config') diff --git a/application/config/database.php b/application/config/database.php index f0b839757..361df9032 100644 --- a/application/config/database.php +++ b/application/config/database.php @@ -65,6 +65,13 @@ | ['autoinit'] Whether or not to automatically initialize the database. | ['encrypt'] Whether or not to use an encrypted connection. | ['compress'] Whether or not to use client compression (MySQL only) +| ['save_queries'] TRUE/FALSE - save all executed queries. +| Note: Useful for development when using with profiler. However, +| when too many queries run, it leads to memory exhaust. So for production +| mode it is better to set it FALSE. Also, if set to FALSE, the +| $this->db->last_query() will return FALSE. This setting can +| also be changed during runtime by using +| $this->db->save_queries = TRUE|FALSE; | ['stricton'] TRUE/FALSE - forces 'Strict Mode' connections | - good for ensuring strict SQL while developing | ['failover'] array - A array with 0 or more data for connections if the main should fail. @@ -97,6 +104,7 @@ $db['default'] = array( 'autoinit' => TRUE, 'encrypt' => FALSE, 'compress' => FALSE, + 'save_queries' => TRUE, 'stricton' => FALSE, 'failover' => array() ); -- cgit v1.2.3-24-g4f1b From 5cf7effebcd8f1abe823c6bc8e66e08a6a50c7dd Mon Sep 17 00:00:00 2001 From: Ahmedul Haque Abid Date: Sun, 19 Jan 2014 13:25:18 +0600 Subject: Fix whitespaces to tabs. --- application/config/database.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'application/config') diff --git a/application/config/database.php b/application/config/database.php index 361df9032..62ff3e0a5 100644 --- a/application/config/database.php +++ b/application/config/database.php @@ -68,7 +68,7 @@ | ['save_queries'] TRUE/FALSE - save all executed queries. | Note: Useful for development when using with profiler. However, | when too many queries run, it leads to memory exhaust. So for production -| mode it is better to set it FALSE. Also, if set to FALSE, the +| mode it is better to set it FALSE. Also, if set to FALSE, the | $this->db->last_query() will return FALSE. This setting can | also be changed during runtime by using | $this->db->save_queries = TRUE|FALSE; -- cgit v1.2.3-24-g4f1b From 1c8245a22874051f5342824d5299d6ad55f4995c Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Mon, 20 Jan 2014 10:28:20 +0200 Subject: Polish changes from PR #2830 --- application/config/database.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'application/config') diff --git a/application/config/database.php b/application/config/database.php index 62ff3e0a5..44fe307d6 100644 --- a/application/config/database.php +++ b/application/config/database.php @@ -65,16 +65,16 @@ | ['autoinit'] Whether or not to automatically initialize the database. | ['encrypt'] Whether or not to use an encrypted connection. | ['compress'] Whether or not to use client compression (MySQL only) -| ['save_queries'] TRUE/FALSE - save all executed queries. -| Note: Useful for development when using with profiler. However, -| when too many queries run, it leads to memory exhaust. So for production -| mode it is better to set it FALSE. Also, if set to FALSE, the -| $this->db->last_query() will return FALSE. This setting can -| also be changed during runtime by using -| $this->db->save_queries = TRUE|FALSE; | ['stricton'] TRUE/FALSE - forces 'Strict Mode' connections | - good for ensuring strict SQL while developing | ['failover'] array - A array with 0 or more data for connections if the main should fail. +| ['save_queries'] TRUE/FALSE - Whether to "save" all executed queries. +| NOTE: Disabling this will also effectively disable both +| $this->db->last_query() and profiling of DB queries. +| When you run a query, with this setting set to TRUE (default), +| CodeIgniter will store the SQL statement for debugging purposes. +| However, this may cause high memory usage, especially if you run +| a lot of SQL queries ... disable this to avoid that problem. | | The $active_group variable lets you choose which connection group to | make active. By default there is only one group (the 'default' group). @@ -104,9 +104,9 @@ $db['default'] = array( 'autoinit' => TRUE, 'encrypt' => FALSE, 'compress' => FALSE, - 'save_queries' => TRUE, 'stricton' => FALSE, - 'failover' => array() + 'failover' => array(), + 'save_queries' => TRUE ); /* End of file database.php */ -- cgit v1.2.3-24-g4f1b From 90c54b683628ac180dd0fd9689c747def5d16b44 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Tue, 11 Feb 2014 12:07:56 +0200 Subject: Fix a typo in the smileys config (PR #2853) --- application/config/smileys.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'application/config') diff --git a/application/config/smileys.php b/application/config/smileys.php index 3c49c469e..2d7a8fefc 100644 --- a/application/config/smileys.php +++ b/application/config/smileys.php @@ -83,7 +83,7 @@ $smileys = array( ':coolcheese:' => array('shade_cheese.gif', '19', '19', 'cool cheese'), ':vampire:' => array('vampire.gif', '19', '19', 'vampire'), ':snake:' => array('snake.gif', '19', '19', 'snake'), - ':exclaim:' => array('exclaim.gif', '19', '19', 'excaim'), + ':exclaim:' => array('exclaim.gif', '19', '19', 'exclaim'), ':question:' => array('question.gif', '19', '19', 'question') ); -- 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/autoload.php | 2 +- application/config/config.php | 2 +- application/config/constants.php | 2 +- application/config/database.php | 2 +- application/config/doctypes.php | 2 +- application/config/foreign_chars.php | 2 +- application/config/hooks.php | 2 +- application/config/memcached.php | 2 +- application/config/migration.php | 2 +- application/config/mimes.php | 2 +- application/config/profiler.php | 2 +- application/config/routes.php | 2 +- application/config/smileys.php | 2 +- application/config/user_agents.php | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) (limited to 'application/config') diff --git a/application/config/autoload.php b/application/config/autoload.php index 43d53155b..3bf999e99 100644 --- a/application/config/autoload.php +++ b/application/config/autoload.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 diff --git a/application/config/config.php b/application/config/config.php index ae748defd..e0b5a4c16 100644 --- a/application/config/config.php +++ b/application/config/config.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 diff --git a/application/config/constants.php b/application/config/constants.php index e71097b6c..e2820ad2b 100644 --- a/application/config/constants.php +++ b/application/config/constants.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 diff --git a/application/config/database.php b/application/config/database.php index 44fe307d6..56bea72aa 100644 --- a/application/config/database.php +++ b/application/config/database.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 diff --git a/application/config/doctypes.php b/application/config/doctypes.php index b1a8959c2..3086a35f9 100644 --- a/application/config/doctypes.php +++ b/application/config/doctypes.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 diff --git a/application/config/foreign_chars.php b/application/config/foreign_chars.php index ab98224f7..07fc1785b 100644 --- a/application/config/foreign_chars.php +++ b/application/config/foreign_chars.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 diff --git a/application/config/hooks.php b/application/config/hooks.php index c7532f538..18fb7b6ad 100644 --- a/application/config/hooks.php +++ b/application/config/hooks.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 diff --git a/application/config/memcached.php b/application/config/memcached.php index 714e81f6b..0499c66b5 100644 --- a/application/config/memcached.php +++ b/application/config/memcached.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 2.0 diff --git a/application/config/migration.php b/application/config/migration.php index a7576cae9..9191fcfba 100644 --- a/application/config/migration.php +++ b/application/config/migration.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 diff --git a/application/config/mimes.php b/application/config/mimes.php index 27d4b2514..2b4c36805 100644 --- a/application/config/mimes.php +++ b/application/config/mimes.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 diff --git a/application/config/profiler.php b/application/config/profiler.php index fb9d8eed4..b08666cb0 100644 --- a/application/config/profiler.php +++ b/application/config/profiler.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 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 diff --git a/application/config/smileys.php b/application/config/smileys.php index 2d7a8fefc..6d329d412 100644 --- a/application/config/smileys.php +++ b/application/config/smileys.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 diff --git a/application/config/user_agents.php b/application/config/user_agents.php index 819e42b69..d34ff3515 100644 --- a/application/config/user_agents.php +++ b/application/config/user_agents.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/autoload.php | 3 ++- application/config/config.php | 3 ++- application/config/constants.php | 3 ++- application/config/database.php | 4 +++- application/config/doctypes.php | 3 ++- application/config/foreign_chars.php | 3 ++- application/config/hooks.php | 3 ++- application/config/memcached.php | 3 ++- application/config/migration.php | 3 ++- application/config/mimes.php | 3 ++- application/config/profiler.php | 3 ++- application/config/routes.php | 3 ++- application/config/smileys.php | 3 ++- application/config/user_agents.php | 3 ++- 14 files changed, 29 insertions(+), 14 deletions(-) (limited to 'application/config') diff --git a/application/config/autoload.php b/application/config/autoload.php index 3bf999e99..f3ae942a2 100644 --- a/application/config/autoload.php +++ b/application/config/autoload.php @@ -1,4 +1,4 @@ - '', diff --git a/application/config/foreign_chars.php b/application/config/foreign_chars.php index 07fc1785b..e151364ad 100644 --- a/application/config/foreign_chars.php +++ b/application/config/foreign_chars.php @@ -1,4 +1,4 @@ -