From 999d7f7861ad6430d515514ce71fa44bd6b77a46 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Thu, 13 Aug 2015 13:14:59 +0300 Subject: Update config/constants.php with defined() checks Allows for easier override with an environment-based configs. Close #4045 --- application/config/constants.php | 68 ++++++++++++++++++++-------------------- 1 file changed, 34 insertions(+), 34 deletions(-) (limited to 'application/config') diff --git a/application/config/constants.php b/application/config/constants.php index 48283e223..e8d2c00ea 100644 --- a/application/config/constants.php +++ b/application/config/constants.php @@ -1,6 +1,18 @@ Date: Sun, 23 Aug 2015 17:32:54 +0300 Subject: Specify to which character dashes will be replaced --- application/config/routes.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'application/config') diff --git a/application/config/routes.php b/application/config/routes.php index a98c6d122..599c79b0e 100644 --- a/application/config/routes.php +++ b/application/config/routes.php @@ -43,8 +43,8 @@ defined('BASEPATH') OR exit('No direct script access allowed'); | 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. +| When you set this option to TRUE, it will replace ALL dashes with +| underscores in the controller and method URI segments. | | Examples: my-controller/index -> my_controller/index | my-controller/my-method -> my_controller/my_method -- cgit v1.2.3-24-g4f1b From 76d5f881ecd0c70759cbebc9c5c622ef7d716aa8 Mon Sep 17 00:00:00 2001 From: Rafael Schwemmer Date: Thu, 5 Nov 2015 22:49:17 +0100 Subject: Added MIME types for JPEG2000 Added all MIME types and file extensions to support JPEG2000 images as allowed file type. --- application/config/mimes.php | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'application/config') diff --git a/application/config/mimes.php b/application/config/mimes.php index 8eff4d2d5..a9b82008f 100644 --- a/application/config/mimes.php +++ b/application/config/mimes.php @@ -78,6 +78,14 @@ return array( 'jpeg' => array('image/jpeg', 'image/pjpeg'), 'jpg' => array('image/jpeg', 'image/pjpeg'), 'jpe' => array('image/jpeg', 'image/pjpeg'), + 'jp2' => array('image/jp2', 'video/mj2', 'image/jpx', 'image/jpm'), + 'j2k' => array('image/jp2', 'video/mj2', 'image/jpx', 'image/jpm'), + 'jpf' => array('image/jp2', 'video/mj2', 'image/jpx', 'image/jpm'), + 'jpg2' => array('image/jp2', 'video/mj2', 'image/jpx', 'image/jpm'), + 'jpx' => array('image/jp2', 'video/mj2', 'image/jpx', 'image/jpm'), + 'jpm' => array('image/jp2', 'video/mj2', 'image/jpx', 'image/jpm'), + 'mj2' => array('image/jp2', 'video/mj2', 'image/jpx', 'image/jpm'), + 'mjp2' => array('image/jp2', 'video/mj2', 'image/jpx', 'image/jpm'), 'png' => array('image/png', 'image/x-png'), 'tiff' => 'image/tiff', 'tif' => 'image/tiff', -- cgit v1.2.3-24-g4f1b From 871811e81af949c52604eb1df8394c0071dba10c Mon Sep 17 00:00:00 2001 From: Rafael Schwemmer Date: Fri, 6 Nov 2015 10:22:00 +0100 Subject: Fixed white-space for JPEG2000 MIME types Replaced spaces by tabs to be consistent with rest of the code --- application/config/mimes.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'application/config') diff --git a/application/config/mimes.php b/application/config/mimes.php index a9b82008f..5e43773a8 100644 --- a/application/config/mimes.php +++ b/application/config/mimes.php @@ -78,14 +78,14 @@ return array( 'jpeg' => array('image/jpeg', 'image/pjpeg'), 'jpg' => array('image/jpeg', 'image/pjpeg'), 'jpe' => array('image/jpeg', 'image/pjpeg'), - 'jp2' => array('image/jp2', 'video/mj2', 'image/jpx', 'image/jpm'), - 'j2k' => array('image/jp2', 'video/mj2', 'image/jpx', 'image/jpm'), - 'jpf' => array('image/jp2', 'video/mj2', 'image/jpx', 'image/jpm'), - 'jpg2' => array('image/jp2', 'video/mj2', 'image/jpx', 'image/jpm'), - 'jpx' => array('image/jp2', 'video/mj2', 'image/jpx', 'image/jpm'), - 'jpm' => array('image/jp2', 'video/mj2', 'image/jpx', 'image/jpm'), - 'mj2' => array('image/jp2', 'video/mj2', 'image/jpx', 'image/jpm'), - 'mjp2' => array('image/jp2', 'video/mj2', 'image/jpx', 'image/jpm'), + 'jp2' => array('image/jp2', 'video/mj2', 'image/jpx', 'image/jpm'), + 'j2k' => array('image/jp2', 'video/mj2', 'image/jpx', 'image/jpm'), + 'jpf' => array('image/jp2', 'video/mj2', 'image/jpx', 'image/jpm'), + 'jpg2' => array('image/jp2', 'video/mj2', 'image/jpx', 'image/jpm'), + 'jpx' => array('image/jp2', 'video/mj2', 'image/jpx', 'image/jpm'), + 'jpm' => array('image/jp2', 'video/mj2', 'image/jpx', 'image/jpm'), + 'mj2' => array('image/jp2', 'video/mj2', 'image/jpx', 'image/jpm'), + 'mjp2' => array('image/jp2', 'video/mj2', 'image/jpx', 'image/jpm'), 'png' => array('image/png', 'image/x-png'), 'tiff' => 'image/tiff', 'tif' => 'image/tiff', -- cgit v1.2.3-24-g4f1b From 58d6854ad29b97061a1eb2fbd96ac57c29a13a3a Mon Sep 17 00:00:00 2001 From: Suhindra Date: Sat, 14 Nov 2015 15:04:00 +0700 Subject: Added and Updated MIME types for Flash Video Update 'f4v' entry and add 'flv' to support Flash Video as allowed file type. --- 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 aa3b1836a..957dc05d8 100644 --- a/application/config/mimes.php +++ b/application/config/mimes.php @@ -137,7 +137,8 @@ return array( '3gp' => array('video/3gp', 'video/3gpp'), 'mp4' => 'video/mp4', 'm4a' => 'audio/x-m4a', - 'f4v' => 'video/mp4', + 'f4v' => array('video/mp4', 'video/x-f4v'), + 'flv' => 'video/x-flv', 'webm' => 'video/webm', 'aac' => 'audio/x-acc', 'm4u' => 'application/vnd.mpegurl', -- cgit v1.2.3-24-g4f1b From 3933a3f8a96346d45d98d2c15a41b14ec1f970b2 Mon Sep 17 00:00:00 2001 From: Suhindra Date: Thu, 17 Dec 2015 09:04:05 +0700 Subject: added Vivaldi browser added new browser Vivaldi --- 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 1129dbacd..721ec08d3 100644 --- a/application/config/user_agents.php +++ b/application/config/user_agents.php @@ -87,7 +87,8 @@ $browsers = array( 'amaya' => 'Amaya', 'IBrowse' => 'IBrowse', 'Maxthon' => 'Maxthon', - 'Ubuntu' => 'Ubuntu Web Browser' + 'Ubuntu' => 'Ubuntu Web Browser', + 'Vivaldi' => 'Vivaldi' ); $mobiles = array( -- cgit v1.2.3-24-g4f1b From 8219714647602c94dd38e6b2efedb4e7ed1c8c4e Mon Sep 17 00:00:00 2001 From: Fery Wardiyanto Date: Sat, 9 Jan 2016 19:30:32 +0700 Subject: Add extra mime for .ogg file Signed-off-by: Fery Wardiyanto --- 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 957dc05d8..8bac87251 100644 --- a/application/config/mimes.php +++ b/application/config/mimes.php @@ -149,7 +149,7 @@ return array( 'au' => 'audio/x-au', 'ac3' => 'audio/ac3', 'flac' => 'audio/x-flac', - 'ogg' => 'audio/ogg', + 'ogg' => array('audio/ogg', 'video/ogg', 'application/ogg'), 'kmz' => array('application/vnd.google-earth.kmz', 'application/zip', 'application/x-zip'), 'kml' => array('application/vnd.google-earth.kml+xml', 'application/xml', 'text/xml'), 'ics' => 'text/calendar', -- cgit v1.2.3-24-g4f1b From d1688af15458af8684a109e5e65f41a8a02786fb Mon Sep 17 00:00:00 2001 From: Jason Neal Date: Wed, 13 Jan 2016 08:46:03 -0500 Subject: Fix type in default constants configuration The word "destructive" was misspelled in the conditional portion. --- application/config/constants.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'application/config') diff --git a/application/config/constants.php b/application/config/constants.php index e8d2c00ea..18d3b4b76 100644 --- a/application/config/constants.php +++ b/application/config/constants.php @@ -42,7 +42,7 @@ defined('DIR_WRITE_MODE') OR define('DIR_WRITE_MODE', 0755); defined('FOPEN_READ') OR define('FOPEN_READ', 'rb'); defined('FOPEN_READ_WRITE') OR define('FOPEN_READ_WRITE', 'r+b'); defined('FOPEN_WRITE_CREATE_DESTRUCTIVE') OR define('FOPEN_WRITE_CREATE_DESTRUCTIVE', 'wb'); // truncates existing file data, use with care -defined('FOPEN_READ_WRITE_CREATE_DESCTRUCTIVE') OR define('FOPEN_READ_WRITE_CREATE_DESTRUCTIVE', 'w+b'); // truncates existing file data, use with care +defined('FOPEN_READ_WRITE_CREATE_DESTRUCTIVE') OR define('FOPEN_READ_WRITE_CREATE_DESTRUCTIVE', 'w+b'); // truncates existing file data, use with care defined('FOPEN_WRITE_CREATE') OR define('FOPEN_WRITE_CREATE', 'ab'); defined('FOPEN_READ_WRITE_CREATE') OR define('FOPEN_READ_WRITE_CREATE', 'a+b'); defined('FOPEN_WRITE_CREATE_STRICT') OR define('FOPEN_WRITE_CREATE_STRICT', 'xb'); -- cgit v1.2.3-24-g4f1b From 46adb9fdbc9604065dc7990bc61707446aa5cc81 Mon Sep 17 00:00:00 2001 From: Kristian Matthews Date: Thu, 11 Feb 2016 21:23:30 +0000 Subject: Autoload Driver Object Names Updated documentation for `$autoload['drivers']`. Updated loader to autoload drivers with object names the same as autoloading libraries. Signed-off-by: Kristian Matthews --- 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 4bc6bf0ad..aeacbdb66 100644 --- a/application/config/autoload.php +++ b/application/config/autoload.php @@ -72,6 +72,11 @@ $autoload['libraries'] = array(); | Prototype: | | $autoload['drivers'] = array('cache'); +| +| You can also supply an alternative library name to be assigned in +| the controller: +| +| $autoload['drivers'] = array('cache' => 'cch'); */ $autoload['drivers'] = array(); -- cgit v1.2.3-24-g4f1b From 2426635afc58f7bbf8355e80d4228076321a669d Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Mon, 15 Feb 2016 14:21:13 +0200 Subject: [ci skip] Add notes in config about CLI for url_suffix, permitted_uri_chars --- application/config/config.php | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'application/config') diff --git a/application/config/config.php b/application/config/config.php index 23ef5a528..0a7b8202b 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -63,6 +63,8 @@ $config['uri_protocol'] = 'REQUEST_URI'; | For more information please see the user guide: | | https://codeigniter.com/user_guide/general/urls.html +| +| Note: This option is ignored for CLI requests. */ $config['url_suffix'] = ''; @@ -157,6 +159,8 @@ $config['composer_autoload'] = FALSE; | | DO NOT CHANGE THIS UNLESS YOU FULLY UNDERSTAND THE REPERCUSSIONS!! | +| Note: This option is ignored for CLI requests. +| */ $config['permitted_uri_chars'] = 'a-z 0-9~%.:_\-'; -- cgit v1.2.3-24-g4f1b From a7bd30c75e844f133b6aa8aae7c64e6cf9ce143a Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Mon, 15 Feb 2016 14:39:59 +0200 Subject: [ci skip] Polish changes from PR #4453 --- application/config/autoload.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'application/config') diff --git a/application/config/autoload.php b/application/config/autoload.php index aeacbdb66..7cdc9013c 100644 --- a/application/config/autoload.php +++ b/application/config/autoload.php @@ -73,10 +73,11 @@ $autoload['libraries'] = array(); | | $autoload['drivers'] = array('cache'); | -| You can also supply an alternative library name to be assigned in +| You can also supply an alternative property name to be assigned in | the controller: | -| $autoload['drivers'] = array('cache' => 'cch'); +| $autoload['drivers'] = array('cache' => 'cch'); +| */ $autoload['drivers'] = array(); -- cgit v1.2.3-24-g4f1b From df70014e4be5b7d45c123adecd194b457ffb971b Mon Sep 17 00:00:00 2001 From: el-ma Date: Wed, 25 May 2016 18:03:28 +0300 Subject: added "Alexa Crawler" --- 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 721ec08d3..f520df9bd 100644 --- a/application/config/user_agents.php +++ b/application/config/user_agents.php @@ -208,5 +208,6 @@ $robots = array( 'CRAZYWEBCRAWLER' => 'Crazy Webcrawler', 'adsbot-google' => 'AdsBot Google', 'feedfetcher-google' => 'Feedfetcher Google', - 'curious george' => 'Curious George' + 'curious george' => 'Curious George', + 'ia_archiver' => 'Alexa Crawler' ); -- cgit v1.2.3-24-g4f1b From 5bdcdd1f6c263ecdccabeb20f313215fb8532b88 Mon Sep 17 00:00:00 2001 From: el-ma Date: Thu, 26 May 2016 09:34:16 +0300 Subject: Update robots in config/user_agents.php Added Majestic-12 and Uptimebot --- application/config/user_agents.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'application/config') diff --git a/application/config/user_agents.php b/application/config/user_agents.php index f520df9bd..1359bbea9 100644 --- a/application/config/user_agents.php +++ b/application/config/user_agents.php @@ -209,5 +209,7 @@ $robots = array( 'adsbot-google' => 'AdsBot Google', 'feedfetcher-google' => 'Feedfetcher Google', 'curious george' => 'Curious George', - 'ia_archiver' => 'Alexa Crawler' + 'ia_archiver' => 'Alexa Crawler', + 'MJ12bot' => 'Majestic-12', + 'Uptimebot' => 'Uptimebot' ); -- cgit v1.2.3-24-g4f1b From 19d033c5e32b0ab61041381c76b34f972513e525 Mon Sep 17 00:00:00 2001 From: "Éderson T. Szlachta" Date: Mon, 29 Aug 2016 19:04:34 -0300 Subject: OpenOffice mime-types According to IANA media types : http://www.iana.org/assignments/media-types/media-types.xhtml --- application/config/mimes.php | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'application/config') diff --git a/application/config/mimes.php b/application/config/mimes.php index 8bac87251..017653335 100644 --- a/application/config/mimes.php +++ b/application/config/mimes.php @@ -163,5 +163,21 @@ return array( 'vcf' => 'text/x-vcard', 'srt' => array('text/srt', 'text/plain'), 'vtt' => array('text/vtt', 'text/plain'), - 'ico' => array('image/x-icon', 'image/x-ico', 'image/vnd.microsoft.icon') + 'ico' => array('image/x-icon', 'image/x-ico', 'image/vnd.microsoft.icon'), + 'odc' => 'application/vnd.oasis.opendocument.chart', + 'otc' => 'application/vnd.oasis.opendocument.chart-template', + 'odf' => 'application/vnd.oasis.opendocument.formula', + 'otf' => 'application/vnd.oasis.opendocument.formula-template', + 'odg' => 'application/vnd.oasis.opendocument.graphics', + 'otg' => 'application/vnd.oasis.opendocument.graphics-template', + 'odi' => 'application/vnd.oasis.opendocument.image', + 'oti' => 'application/vnd.oasis.opendocument.image-template', + 'odp' => 'application/vnd.oasis.opendocument.presentation', + 'otp' => 'application/vnd.oasis.opendocument.presentation-template', + 'ods' => 'application/vnd.oasis.opendocument.spreadsheet', + 'ots' => 'application/vnd.oasis.opendocument.spreadsheet-template', + 'odt' => 'application/vnd.oasis.opendocument.text', + 'odm' => 'application/vnd.oasis.opendocument.text-master', + 'ott' => 'application/vnd.oasis.opendocument.text-template', + 'oth' => 'application/vnd.oasis.opendocument.text-web' ); -- cgit v1.2.3-24-g4f1b From d2e4ccfe3bba903227c3686b9390d8b9525b197d Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Mon, 12 Dec 2016 15:15:39 +0200 Subject: Remove previously deprecated Smiley Helper --- application/config/smileys.php | 64 ------------------------------------------ 1 file changed, 64 deletions(-) delete mode 100644 application/config/smileys.php (limited to 'application/config') diff --git a/application/config/smileys.php b/application/config/smileys.php deleted file mode 100644 index abf9a898d..000000000 --- a/application/config/smileys.php +++ /dev/null @@ -1,64 +0,0 @@ - array('grin.gif', '19', '19', 'grin'), - ':lol:' => array('lol.gif', '19', '19', 'LOL'), - ':cheese:' => array('cheese.gif', '19', '19', 'cheese'), - ':)' => array('smile.gif', '19', '19', 'smile'), - ';-)' => array('wink.gif', '19', '19', 'wink'), - ';)' => array('wink.gif', '19', '19', 'wink'), - ':smirk:' => array('smirk.gif', '19', '19', 'smirk'), - ':roll:' => array('rolleyes.gif', '19', '19', 'rolleyes'), - ':-S' => array('confused.gif', '19', '19', 'confused'), - ':wow:' => array('surprise.gif', '19', '19', 'surprised'), - ':bug:' => array('bigsurprise.gif', '19', '19', 'big surprise'), - ':-P' => array('tongue_laugh.gif', '19', '19', 'tongue laugh'), - '%-P' => array('tongue_rolleye.gif', '19', '19', 'tongue rolleye'), - ';-P' => array('tongue_wink.gif', '19', '19', 'tongue wink'), - ':P' => array('raspberry.gif', '19', '19', 'raspberry'), - ':blank:' => array('blank.gif', '19', '19', 'blank stare'), - ':long:' => array('longface.gif', '19', '19', 'long face'), - ':ohh:' => array('ohh.gif', '19', '19', 'ohh'), - ':grrr:' => array('grrr.gif', '19', '19', 'grrr'), - ':gulp:' => array('gulp.gif', '19', '19', 'gulp'), - '8-/' => array('ohoh.gif', '19', '19', 'oh oh'), - ':down:' => array('downer.gif', '19', '19', 'downer'), - ':red:' => array('embarrassed.gif', '19', '19', 'red face'), - ':sick:' => array('sick.gif', '19', '19', 'sick'), - ':shut:' => array('shuteye.gif', '19', '19', 'shut eye'), - ':-/' => array('hmm.gif', '19', '19', 'hmmm'), - '>:(' => array('mad.gif', '19', '19', 'mad'), - ':mad:' => array('mad.gif', '19', '19', 'mad'), - '>:-(' => array('angry.gif', '19', '19', 'angry'), - ':angry:' => array('angry.gif', '19', '19', 'angry'), - ':zip:' => array('zip.gif', '19', '19', 'zipper'), - ':kiss:' => array('kiss.gif', '19', '19', 'kiss'), - ':ahhh:' => array('shock.gif', '19', '19', 'shock'), - ':coolsmile:' => array('shade_smile.gif', '19', '19', 'cool smile'), - ':coolsmirk:' => array('shade_smirk.gif', '19', '19', 'cool smirk'), - ':coolgrin:' => array('shade_grin.gif', '19', '19', 'cool grin'), - ':coolhmm:' => array('shade_hmm.gif', '19', '19', 'cool hmm'), - ':coolmad:' => array('shade_mad.gif', '19', '19', 'cool mad'), - ':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', 'exclaim'), - ':question:' => array('question.gif', '19', '19', 'question') - -); -- cgit v1.2.3-24-g4f1b From 8e37b8560c75d3994e59f401be977dcf386bb210 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Wed, 14 Dec 2016 13:13:05 +0200 Subject: Remove 'allow_get_array', 'standardize_newlines' config settings --- application/config/config.php | 28 ---------------------------- 1 file changed, 28 deletions(-) (limited to 'application/config') diff --git a/application/config/config.php b/application/config/config.php index c088e80c0..535f0f817 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -191,20 +191,6 @@ $config['controller_trigger'] = 'c'; $config['function_trigger'] = 'm'; $config['directory_trigger'] = 'd'; -/* -|-------------------------------------------------------------------------- -| Allow $_GET array -|-------------------------------------------------------------------------- -| -| By default CodeIgniter enables access to the $_GET array. If for some -| reason you would like to disable it, set 'allow_get_array' to FALSE. -| -| WARNING: This feature is DEPRECATED and currently available only -| for backwards compatibility purposes! -| -*/ -$config['allow_get_array'] = TRUE; - /* |-------------------------------------------------------------------------- | Error Logging Threshold @@ -410,20 +396,6 @@ $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 occurrences with the PHP_EOL value. -| -| WARNING: This feature is DEPRECATED and currently available only -| for backwards compatibility purposes! -| -*/ -$config['standardize_newlines'] = FALSE; - /* |-------------------------------------------------------------------------- | Global XSS Filtering -- cgit v1.2.3-24-g4f1b From 4e0c208f24b0755c47905e17b82854c538a0c530 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Wed, 14 Dec 2016 13:23:06 +0200 Subject: Remove 'global_xss_filtering' config setting --- application/config/config.php | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'application/config') diff --git a/application/config/config.php b/application/config/config.php index 535f0f817..d37af34b7 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -396,20 +396,6 @@ $config['cookie_path'] = '/'; $config['cookie_secure'] = FALSE; $config['cookie_httponly'] = FALSE; -/* -|-------------------------------------------------------------------------- -| Global XSS Filtering -|-------------------------------------------------------------------------- -| -| Determines whether the XSS filter is always active when GET, POST or -| COOKIE data is encountered -| -| WARNING: This feature is DEPRECATED and currently available only -| for backwards compatibility purposes! -| -*/ -$config['global_xss_filtering'] = FALSE; - /* |-------------------------------------------------------------------------- | Cross Site Request Forgery -- cgit v1.2.3-24-g4f1b From 24c866628d0ce5463d7e8b4eba512fa9e7752dfd Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Wed, 14 Dec 2016 16:14:13 +0200 Subject: Drop all PHP 5.3-related code --- application/config/config.php | 14 -------------- application/config/database.php | 2 +- 2 files changed, 1 insertion(+), 15 deletions(-) (limited to 'application/config') diff --git a/application/config/config.php b/application/config/config.php index d37af34b7..c6e1a7af5 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -452,20 +452,6 @@ $config['compress_output'] = FALSE; */ $config['time_reference'] = 'local'; -/* -|-------------------------------------------------------------------------- -| Rewrite PHP Short Tags -|-------------------------------------------------------------------------- -| -| If your PHP installation does not have short tag support enabled CI -| can rewrite the tags on-the-fly, enabling you to utilize that syntax -| in your view files. Options are TRUE or FALSE (boolean) -| -| Note: You need to have eval() enabled for this to work. -| -*/ -$config['rewrite_short_tags'] = FALSE; - /* |-------------------------------------------------------------------------- | Reverse Proxy IPs diff --git a/application/config/database.php b/application/config/database.php index bf9857fff..b4d8a6a3e 100644 --- a/application/config/database.php +++ b/application/config/database.php @@ -22,7 +22,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); | ['dbdriver'] The database driver. e.g.: mysqli. | Currently supported: | cubrid, ibase, mssql, mysql, mysqli, oci8, -| odbc, pdo, postgre, sqlite, sqlite3, sqlsrv +| odbc, pdo, postgre, sqlite3, sqlsrv | ['dbprefix'] You can add an optional prefix, which will be added | to the table name when using the Query Builder class | ['pconnect'] TRUE/FALSE - Whether to use a persistent connection -- cgit v1.2.3-24-g4f1b From d107d6d950b38b46fba58488c201d5cac35be156 Mon Sep 17 00:00:00 2001 From: vlakoff Date: Tue, 7 Feb 2017 11:01:55 +0100 Subject: Allow to omit trailing slash in config paths --- application/config/config.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'application/config') diff --git a/application/config/config.php b/application/config/config.php index c6e1a7af5..72e79bee9 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -221,7 +221,7 @@ $config['log_threshold'] = 0; |-------------------------------------------------------------------------- | | Leave this BLANK unless you would like to set something other than the default -| application/logs/ directory. Use a full server path with trailing slash. +| application/logs/ directory. Use a full server path. | */ $config['log_path'] = ''; @@ -269,7 +269,7 @@ $config['log_date_format'] = 'Y-m-d H:i:s'; |-------------------------------------------------------------------------- | | Leave this BLANK unless you would like to set something other than the default -| application/views/errors/ directory. Use a full server path with trailing slash. +| application/views/errors/ directory. Use a full server path. | */ $config['error_views_path'] = ''; @@ -280,7 +280,7 @@ $config['error_views_path'] = ''; |-------------------------------------------------------------------------- | | Leave this BLANK unless you would like to set something other than the default -| application/cache/ directory. Use a full server path with trailing slash. +| application/cache/ directory. Use a full server path. | */ $config['cache_path'] = ''; -- cgit v1.2.3-24-g4f1b From a92de9145196be119fefa5b294c6489d72e45b2d Mon Sep 17 00:00:00 2001 From: Paweł Kłopotek-Główczewski Date: Sat, 30 Sep 2017 21:08:06 +0200 Subject: Adding some letters translated to Y in foregin_chars.php MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Paweł Kłopotek-Główczewski --- application/config/foreign_chars.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'application/config') diff --git a/application/config/foreign_chars.php b/application/config/foreign_chars.php index ac406e3d4..995f48304 100644 --- a/application/config/foreign_chars.php +++ b/application/config/foreign_chars.php @@ -59,8 +59,8 @@ $foreign_characters = array( '/Þ|þ/' => 'th', '/Ù|Ú|Û|Ũ|Ū|Ŭ|Ů|Ű|Ų|Ư|Ǔ|Ǖ|Ǘ|Ǚ|Ǜ|Ũ|Ủ|Ụ|Ừ|Ứ|Ữ|Ử|Ự|У/' => 'U', '/ù|ú|û|ũ|ū|ŭ|ů|ű|ų|ư|ǔ|ǖ|ǘ|ǚ|ǜ|υ|ύ|ϋ|ủ|ụ|ừ|ứ|ữ|ử|ự|у/' => 'u', - '/Ý|Ÿ|Ŷ|Υ|Ύ|Ϋ|Ỳ|Ỹ|Ỷ|Ỵ|Й/' => 'Y', - '/ý|ÿ|ŷ|ỳ|ỹ|ỷ|ỵ|й/' => 'y', + '/Ƴ|Ɏ|Ỵ|Ẏ|Ӳ|Ӯ|Ў|Ý|Ÿ|Ŷ|Υ|Ύ|Ϋ|Ỳ|Ỹ|Ỷ|Ỵ|Й/' => 'Y', + '/ẙ|ʏ|ƴ|ɏ|ỵ|ẏ|ӳ|ӯ|ў|ý|ÿ|ŷ|ỳ|ỹ|ỷ|ỵ|й/' => 'y', '/В/' => 'V', '/в/' => 'v', '/Ŵ/' => 'W', -- cgit v1.2.3-24-g4f1b From a457c20f4183f800d9c14ac779dd440237165cbf Mon Sep 17 00:00:00 2001 From: AJ Dunn Date: Sun, 8 Oct 2017 17:26:40 +1030 Subject: Small spelling fix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Missing ‘e’ in word ‘certificates’. Signed-off-by: AJ Dunn --- 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 b4d8a6a3e..d8566e8c3 100644 --- a/application/config/database.php +++ b/application/config/database.php @@ -47,7 +47,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); | 'ssl_key' - Path to the private key file | 'ssl_cert' - Path to the public key certificate file | 'ssl_ca' - Path to the certificate authority file -| 'ssl_capath' - Path to a directory containing trusted CA certificats in PEM format +| 'ssl_capath' - Path to a directory containing trusted CA certificates in PEM format | 'ssl_cipher' - List of *allowed* ciphers to be used for the encryption, separated by colons (':') | 'ssl_verify' - TRUE/FALSE; Whether verify the server certificate or not ('mysqli' only) | -- cgit v1.2.3-24-g4f1b From 52a87e506d4fc70bd5922b07a532852d28f28ab6 Mon Sep 17 00:00:00 2001 From: Mehdi Bounya Date: Thu, 17 May 2018 23:41:30 +0000 Subject: http:// to https:// --- application/config/config.php | 4 ++-- application/config/constants.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'application/config') diff --git a/application/config/config.php b/application/config/config.php index 72e79bee9..782b19c74 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -88,7 +88,7 @@ $config['language'] = 'english'; | This determines which character set is used by default in various methods | that require a character set to be provided. | -| See http://php.net/htmlspecialchars for a list of supported charsets. +| See https://secure.php.net/htmlspecialchars for a list of supported charsets. | */ $config['charset'] = 'UTF-8'; @@ -133,7 +133,7 @@ $config['subclass_prefix'] = 'MY_'; | | $config['composer_autoload'] = '/path/to/vendor/autoload.php'; | -| For more information about Composer, please visit http://getcomposer.org/ +| For more information about Composer, please visit https://getcomposer.org/ | | Note: This will NOT disable or override the CodeIgniter-specific | autoloading (application/config/autoload.php) diff --git a/application/config/constants.php b/application/config/constants.php index 18d3b4b76..fb5878447 100644 --- a/application/config/constants.php +++ b/application/config/constants.php @@ -65,10 +65,10 @@ defined('FOPEN_READ_WRITE_CREATE_STRICT') OR define('FOPEN_READ_WRITE_CREA | are as follows: | | Standard C/C++ Library (stdlibc): -| http://www.gnu.org/software/libc/manual/html_node/Exit-Status.html +| https://www.gnu.org/software/libc/manual/html_node/Exit-Status.html | (This link also contains other GNU-specific conventions) | BSD sysexits.h: -| http://www.gsp.com/cgi-bin/man.cgi?section=3&topic=sysexits +| https://www.gsp.com/cgi-bin/man.cgi?section=3&topic=sysexits | Bash scripting: | http://tldp.org/LDP/abs/html/exitcodes.html | -- cgit v1.2.3-24-g4f1b From 06546124c29dae97b5346e444fa327fc2076e44f Mon Sep 17 00:00:00 2001 From: George Petculescu Date: Sun, 27 May 2018 00:09:18 +0300 Subject: 7zip mime type renaming 7zip to 7z extension and adding one more mime id to it --- 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 017653335..c2a30d368 100644 --- a/application/config/mimes.php +++ b/application/config/mimes.php @@ -155,7 +155,7 @@ return array( 'ics' => 'text/calendar', 'ical' => 'text/calendar', 'zsh' => 'text/x-scriptzsh', - '7zip' => array('application/x-compressed', 'application/x-zip-compressed', 'application/zip', 'multipart/x-zip'), + '7z' => array('application/x-7z-compressed', 'application/x-compressed', 'application/x-zip-compressed', 'application/zip', 'multipart/x-zip'), 'cdr' => array('application/cdr', 'application/coreldraw', 'application/x-cdr', 'application/x-coreldraw', 'image/cdr', 'image/x-cdr', 'zz-application/zz-winassoc-cdr'), 'wma' => array('audio/x-ms-wma', 'video/x-ms-asf'), 'jar' => array('application/java-archive', 'application/x-java-application', 'application/x-jar', 'application/x-compressed'), -- cgit v1.2.3-24-g4f1b From 8eeb1a88eba76e6d4ed87a7a72a2272c27a1eeb4 Mon Sep 17 00:00:00 2001 From: George Petculescu Date: Fri, 1 Jun 2018 21:10:10 +0300 Subject: Adding 7zip extension to mimes.php Adding 7zip extension back as BC safety measure --- application/config/mimes.php | 1 + 1 file changed, 1 insertion(+) (limited to 'application/config') diff --git a/application/config/mimes.php b/application/config/mimes.php index c2a30d368..0ec9db0a0 100644 --- a/application/config/mimes.php +++ b/application/config/mimes.php @@ -156,6 +156,7 @@ return array( 'ical' => 'text/calendar', 'zsh' => 'text/x-scriptzsh', '7z' => array('application/x-7z-compressed', 'application/x-compressed', 'application/x-zip-compressed', 'application/zip', 'multipart/x-zip'), + '7zip' => array('application/x-7z-compressed', 'application/x-compressed', 'application/x-zip-compressed', 'application/zip', 'multipart/x-zip'), 'cdr' => array('application/cdr', 'application/coreldraw', 'application/x-cdr', 'application/x-coreldraw', 'image/cdr', 'image/x-cdr', 'zz-application/zz-winassoc-cdr'), 'wma' => array('audio/x-ms-wma', 'video/x-ms-asf'), 'jar' => array('application/java-archive', 'application/x-java-application', 'application/x-jar', 'application/x-compressed'), -- cgit v1.2.3-24-g4f1b From 1c0e6cb695880bfb1ec0cc5a662e89305d36a5ca Mon Sep 17 00:00:00 2001 From: Albert Leao Date: Sun, 13 Jan 2019 00:40:30 -0500 Subject: Added mobile google bot to user agents --- 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 12585a065..9aa403eca 100644 --- a/application/config/user_agents.php +++ b/application/config/user_agents.php @@ -111,6 +111,7 @@ $mobiles = array( // Phones and Manufacturers 'motorola' => 'Motorola', 'nokia' => 'Nokia', + 'nexus' => 'Nexus', 'palm' => 'Palm', 'iphone' => 'Apple iPhone', 'ipad' => 'iPad', -- cgit v1.2.3-24-g4f1b From d14d85559266ab16b2261a10ab024276b3f3c226 Mon Sep 17 00:00:00 2001 From: jonsmith1982 Date: Mon, 28 Jan 2019 12:17:39 +0000 Subject: fixes #5648 Signed-off-by: jonsmith1982 --- application/config/config.php | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'application/config') diff --git a/application/config/config.php b/application/config/config.php index 782b19c74..6710a4b88 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -226,6 +226,17 @@ $config['log_threshold'] = 0; */ $config['log_path'] = ''; +/* +|-------------------------------------------------------------------------- +| Error Logging FILENAME +|-------------------------------------------------------------------------- +| +| Leave this BLANK unless you would like to set something other than the default +| 'log-'.date('Y-m-d') filename. No DIRECTORY_SEPARATOR(s) or file extension +| +*/ +$config['log_file'] = ''; + /* |-------------------------------------------------------------------------- | Log File Extension -- cgit v1.2.3-24-g4f1b From 718b7c9dfb24ceb666eeeffaf63df5385ec28b71 Mon Sep 17 00:00:00 2001 From: Lohith J Date: Fri, 8 Feb 2019 13:46:40 +0530 Subject: corrected grammar --- application/config/config.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'application/config') diff --git a/application/config/config.php b/application/config/config.php index 782b19c74..29a40c81d 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -13,9 +13,9 @@ defined('BASEPATH') OR exit('No direct script access allowed'); | | WARNING: You MUST set this value! | -| If it is not set, then CodeIgniter will try guess the protocol and path -| your installation, but due to security concerns the hostname will be set -| to $_SERVER['SERVER_ADDR'] if available, or localhost otherwise. +| If it is not set, then CodeIgniter will try to guess the protocol and +| path your installation, but due to security concerns the hostname will +| be set to $_SERVER['SERVER_ADDR'] if available, or localhost otherwise. | The auto-detection mechanism exists only for convenience during | development and MUST NOT be used in production! | -- cgit v1.2.3-24-g4f1b From c7e8cf88b9759c16fd180fc037e5bf38e3160449 Mon Sep 17 00:00:00 2001 From: Muhammad Umer Farooq Date: Sun, 24 Mar 2019 10:58:09 +0500 Subject: Update user_agents.php --- 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 9aa403eca..3523528bf 100644 --- a/application/config/user_agents.php +++ b/application/config/user_agents.php @@ -152,6 +152,7 @@ $mobiles = array( 'wii' => 'Nintendo Wii', 'open web' => 'Open Web', 'openweb' => 'OpenWeb', + 'meizu' => 'Meizu', // Operating Systems 'android' => 'Android', -- cgit v1.2.3-24-g4f1b From 3c488678933cbf7f3805e6ceecd64434e4540edb Mon Sep 17 00:00:00 2001 From: "harrys.revis" Date: Wed, 31 Jul 2019 01:42:38 +0300 Subject: Added some greek characters and corrected some of them that showed up wrong --- application/config/foreign_chars.php | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) (limited to 'application/config') diff --git a/application/config/foreign_chars.php b/application/config/foreign_chars.php index 995f48304..0231f3592 100644 --- a/application/config/foreign_chars.php +++ b/application/config/foreign_chars.php @@ -22,10 +22,10 @@ $foreign_characters = array( '/б/' => 'b', '/Ç|Ć|Ĉ|Ċ|Č/' => 'C', '/ç|ć|ĉ|ċ|č/' => 'c', - '/Д/' => 'D', - '/д/' => 'd', - '/Ð|Ď|Đ|Δ/' => 'Dj', - '/ð|ď|đ|δ/' => 'dj', + '/Д|Δ/' => 'D', + '/д|δ/' => 'd', + '/Ð|Ď|Đ/' => 'Dj', + '/ð|ď|đ/' => 'dj', '/È|É|Ê|Ë|Ē|Ĕ|Ė|Ę|Ě|Ε|Έ|Ẽ|Ẻ|Ẹ|Ề|Ế|Ễ|Ể|Ệ|Е|Э/' => 'E', '/è|é|ê|ë|ē|ĕ|ė|ę|ě|έ|ε|ẽ|ẻ|ẹ|ề|ế|ễ|ể|ệ|е|э/' => 'e', '/Ф/' => 'F', @@ -38,6 +38,8 @@ $foreign_characters = array( '/ì|í|î|ï|ĩ|ī|ĭ|ǐ|į|ı|η|ή|ί|ι|ϊ|ỉ|ị|и|ы|ї/' => 'i', '/Ĵ/' => 'J', '/ĵ/' => 'j', + '/Θ/' => 'TH', + '/θ/' => 'th', '/Ķ|Κ|К/' => 'K', '/ķ|κ|к/' => 'k', '/Ĺ|Ļ|Ľ|Ŀ|Ł|Λ|Л/' => 'L', @@ -54,8 +56,8 @@ $foreign_characters = array( '/ŕ|ŗ|ř|ρ|р/' => 'r', '/Ś|Ŝ|Ş|Ș|Š|Σ|С/' => 'S', '/ś|ŝ|ş|ș|š|ſ|σ|ς|с/' => 's', - '/Ț|Ţ|Ť|Ŧ|τ|Т/' => 'T', - '/ț|ţ|ť|ŧ|т/' => 't', + '/Ț|Ţ|Ť|Ŧ|Τ|Т/' => 'T', + '/ț|ţ|ť|ŧ|τ|т/' => 't', '/Þ|þ/' => 'th', '/Ù|Ú|Û|Ũ|Ū|Ŭ|Ů|Ű|Ų|Ư|Ǔ|Ǖ|Ǘ|Ǚ|Ǜ|Ũ|Ủ|Ụ|Ừ|Ứ|Ữ|Ử|Ự|У/' => 'U', '/ù|ú|û|ũ|ū|ŭ|ů|ű|ų|ư|ǔ|ǖ|ǘ|ǚ|ǜ|υ|ύ|ϋ|ủ|ụ|ừ|ứ|ữ|ử|ự|у/' => 'u', @@ -65,6 +67,10 @@ $foreign_characters = array( '/в/' => 'v', '/Ŵ/' => 'W', '/ŵ/' => 'w', + '/Φ/' => 'F', + '/φ/' => 'f', + '/Χ/' => 'CH', + '/χ/' => 'ch', '/Ź|Ż|Ž|Ζ|З/' => 'Z', '/ź|ż|ž|ζ|з/' => 'z', '/Æ|Ǽ/' => 'AE', @@ -73,10 +79,15 @@ $foreign_characters = array( '/ij/' => 'ij', '/Œ/' => 'OE', '/ƒ/' => 'f', + '/Ξ/' => 'KS', '/ξ/' => 'ks', + '/Π/' => 'P', '/π/' => 'p', + '/Β/' => 'V', '/β/' => 'v', + '/Μ/' => 'M', '/μ/' => 'm', + '/Ψ/' => 'PS', '/ψ/' => 'ps', '/Ё/' => 'Yo', '/ё/' => 'yo', -- cgit v1.2.3-24-g4f1b From d267b0660926228940cf010449fb4eb832fc36b5 Mon Sep 17 00:00:00 2001 From: "Kamas \"Iceberg\" Lau" Date: Sun, 11 Aug 2019 06:24:44 +0800 Subject: Fix .aac file mime type --- 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 0ec9db0a0..7aa5c9e4e 100644 --- a/application/config/mimes.php +++ b/application/config/mimes.php @@ -140,7 +140,7 @@ return array( 'f4v' => array('video/mp4', 'video/x-f4v'), 'flv' => 'video/x-flv', 'webm' => 'video/webm', - 'aac' => 'audio/x-acc', + 'aac' => array('audio/x-aac', 'audio/aac'), 'm4u' => 'application/vnd.mpegurl', 'm3u' => 'text/plain', 'xspf' => 'application/xspf+xml', -- cgit v1.2.3-24-g4f1b From 2229e5c96174171d9eec0d595e7693b987374e95 Mon Sep 17 00:00:00 2001 From: Muhammad Umer Farooq Date: Wed, 2 Oct 2019 08:16:54 +0500 Subject: Update user_agents.php --- 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 3523528bf..1a1111be8 100644 --- a/application/config/user_agents.php +++ b/application/config/user_agents.php @@ -153,6 +153,7 @@ $mobiles = array( 'open web' => 'Open Web', 'openweb' => 'OpenWeb', 'meizu' => 'Meizu', + 'infinix' => 'Infinix', // Operating Systems 'android' => 'Android', -- cgit v1.2.3-24-g4f1b From 315acfa47757aef9355a4658a59269530183819d Mon Sep 17 00:00:00 2001 From: Ossama Mehmood <40134503+ossamamehmood@users.noreply.github.com> Date: Sat, 5 Oct 2019 09:20:04 +0500 Subject: Update user_agents.php --- application/config/user_agents.php | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'application/config') diff --git a/application/config/user_agents.php b/application/config/user_agents.php index 3523528bf..48d5ab526 100644 --- a/application/config/user_agents.php +++ b/application/config/user_agents.php @@ -153,6 +153,10 @@ $mobiles = array( 'open web' => 'Open Web', 'openweb' => 'OpenWeb', 'meizu' => 'Meizu', + 'huawei' => 'Huawei', + 'xiaomi' => 'Xiaomi', + 'oppo' => 'Oppo', + 'vivo' => 'Vivo', // Operating Systems 'android' => 'Android', -- cgit v1.2.3-24-g4f1b From 2a80014590526ceaca427d9f9c1f5260b7b0de13 Mon Sep 17 00:00:00 2001 From: Francisco Javier Llanquipichun Garcia Date: Sat, 25 Jan 2020 12:51:09 -0300 Subject: inserted required attribute in html tag Signed-off-by: Francisco Javier Llanquipichun Garcia --- application/config/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'application/config') diff --git a/application/config/index.html b/application/config/index.html index b702fbc39..bcb7cae34 100644 --- a/application/config/index.html +++ b/application/config/index.html @@ -1,5 +1,5 @@ - + 403 Forbidden -- cgit v1.2.3-24-g4f1b From 53c6c92dc73d2729c136a8868b0c16921240ba2a Mon Sep 17 00:00:00 2001 From: Peter Karunyu Date: Sat, 15 Feb 2020 20:09:48 +0300 Subject: Fixed double spacing. --- 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 7aa5c9e4e..88a621a19 100644 --- a/application/config/mimes.php +++ b/application/config/mimes.php @@ -5,7 +5,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); | ------------------------------------------------------------------- | MIME TYPES | ------------------------------------------------------------------- -| This file contains an array of mime types. It is used by the +| This file contains an array of mime types. It is used by the | Upload class to help identify allowed file types. | */ @@ -85,7 +85,7 @@ return array( 'jpm' => array('image/jp2', 'video/mj2', 'image/jpx', 'image/jpm'), 'mj2' => array('image/jp2', 'video/mj2', 'image/jpx', 'image/jpm'), 'mjp2' => array('image/jp2', 'video/mj2', 'image/jpx', 'image/jpm'), - 'png' => array('image/png', 'image/x-png'), + 'png' => array('image/png', 'image/x-png'), 'tiff' => 'image/tiff', 'tif' => 'image/tiff', 'css' => array('text/css', 'text/plain'), -- cgit v1.2.3-24-g4f1b From ddf552391e5fed7bdad930b023c8e83efabef020 Mon Sep 17 00:00:00 2001 From: Wobility Date: Sat, 29 Feb 2020 10:03:52 +0100 Subject: Update with heic format Add heic and heif format for Apple file. --- application/config/mimes.php | 2 ++ 1 file changed, 2 insertions(+) (limited to 'application/config') diff --git a/application/config/mimes.php b/application/config/mimes.php index 7aa5c9e4e..7f854ddeb 100644 --- a/application/config/mimes.php +++ b/application/config/mimes.php @@ -88,6 +88,8 @@ return array( 'png' => array('image/png', 'image/x-png'), 'tiff' => 'image/tiff', 'tif' => 'image/tiff', + 'heic' => 'image/heic', + 'heif' => 'image/heif', 'css' => array('text/css', 'text/plain'), 'html' => array('text/html', 'text/plain'), 'htm' => array('text/html', 'text/plain'), -- cgit v1.2.3-24-g4f1b From c88c2713b550e6edb4dee50aafa0a29d8e62921a Mon Sep 17 00:00:00 2001 From: Robson Piere Date: Tue, 3 Mar 2020 10:32:32 -0300 Subject: Add UptimeRobot user agent Add UptimeRobot user agent, a free website monitor. https://uptimerobot.com/ --- 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 c866903f6..21251f46f 100644 --- a/application/config/user_agents.php +++ b/application/config/user_agents.php @@ -218,5 +218,6 @@ $robots = array( 'curious george' => 'Curious George', 'ia_archiver' => 'Alexa Crawler', 'MJ12bot' => 'Majestic-12', - 'Uptimebot' => 'Uptimebot' + 'Uptimebot' => 'Uptimebot', + 'UptimeRobot' => 'UptimeRobot' ); -- cgit v1.2.3-24-g4f1b From 6ba0207160f8f2b99c79dd285bccf45f574ec660 Mon Sep 17 00:00:00 2001 From: sapics Date: Wed, 24 Jun 2020 11:51:36 +0900 Subject: Fix user guide url Replace from https://codeigniter.com/user_guide/* to https://codeigniter.com/userguide3/* --- application/config/config.php | 8 ++++---- application/config/hooks.php | 2 +- application/config/memcached.php | 2 +- application/config/profiler.php | 2 +- application/config/routes.php | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) (limited to 'application/config') diff --git a/application/config/config.php b/application/config/config.php index 782b19c74..f92d11f5d 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -62,7 +62,7 @@ $config['uri_protocol'] = 'REQUEST_URI'; | This option allows you to add a suffix to all URLs generated by CodeIgniter. | For more information please see the user guide: | -| https://codeigniter.com/user_guide/general/urls.html +| https://codeigniter.com/userguide3/general/urls.html | | Note: This option is ignored for CLI requests. */ @@ -112,8 +112,8 @@ $config['enable_hooks'] = FALSE; | This item allows you to set the filename/classname prefix when extending | native libraries. For more information please see the user guide: | -| https://codeigniter.com/user_guide/general/core_classes.html -| https://codeigniter.com/user_guide/general/creating_libraries.html +| https://codeigniter.com/userguide3/general/core_classes.html +| https://codeigniter.com/userguide3/general/creating_libraries.html | */ $config['subclass_prefix'] = 'MY_'; @@ -311,7 +311,7 @@ $config['cache_query_string'] = FALSE; | If you use the Encryption class, you must set an encryption key. | See the user guide for more info. | -| https://codeigniter.com/user_guide/libraries/encryption.html +| https://codeigniter.com/userguide3/libraries/encryption.html | */ $config['encryption_key'] = ''; diff --git a/application/config/hooks.php b/application/config/hooks.php index a8f38a5dc..79c5c162f 100644 --- a/application/config/hooks.php +++ b/application/config/hooks.php @@ -8,6 +8,6 @@ defined('BASEPATH') OR exit('No direct script access allowed'); | This file lets you define "hooks" to extend CI without hacking the core | files. Please see the user guide for info: | -| https://codeigniter.com/user_guide/general/hooks.html +| https://codeigniter.com/userguide3/general/hooks.html | */ diff --git a/application/config/memcached.php b/application/config/memcached.php index 5c23b39c1..65a149617 100644 --- a/application/config/memcached.php +++ b/application/config/memcached.php @@ -7,7 +7,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); | ------------------------------------------------------------------------- | Your Memcached servers can be specified below. | -| See: https://codeigniter.com/user_guide/libraries/caching.html#memcached +| See: https://codeigniter.com/userguide3/libraries/caching.html#memcached | */ $config = array( diff --git a/application/config/profiler.php b/application/config/profiler.php index 3db22e39c..3436e931e 100644 --- a/application/config/profiler.php +++ b/application/config/profiler.php @@ -9,6 +9,6 @@ defined('BASEPATH') OR exit('No direct script access allowed'); | data are displayed when the Profiler is enabled. | Please see the user guide for info: | -| https://codeigniter.com/user_guide/general/profiling.html +| https://codeigniter.com/userguide3/general/profiling.html | */ diff --git a/application/config/routes.php b/application/config/routes.php index 8ebf62bfa..4c70d921c 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: | -| https://codeigniter.com/user_guide/general/routing.html +| https://codeigniter.com/userguide3/general/routing.html | | ------------------------------------------------------------------------- | RESERVED ROUTES -- cgit v1.2.3-24-g4f1b From eb770fdc6d809bc7c28d499f897c0ab2c449f669 Mon Sep 17 00:00:00 2001 From: George Petculescu Date: Sun, 28 Feb 2021 20:10:00 +0200 Subject: Initial implementation of samesite for CI_Input::set_cookie --- application/config/config.php | 2 ++ 1 file changed, 2 insertions(+) (limited to 'application/config') diff --git a/application/config/config.php b/application/config/config.php index f92d11f5d..4ffd83352 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -385,6 +385,7 @@ $config['sess_regenerate_destroy'] = FALSE; | 'cookie_path' = Typically will be a forward slash | 'cookie_secure' = Cookie will only be set if a secure HTTPS connection exists. | 'cookie_httponly' = Cookie will only be accessible via HTTP(S) (no javascript) +| 'cookie_samesite' = Cookie's samesite attribute (Lax, Strict or None) | | Note: These settings (with the exception of 'cookie_prefix' and | 'cookie_httponly') will also affect sessions. @@ -395,6 +396,7 @@ $config['cookie_domain'] = ''; $config['cookie_path'] = '/'; $config['cookie_secure'] = FALSE; $config['cookie_httponly'] = FALSE; +$config['cookie_samesite'] = 'lax'; /* |-------------------------------------------------------------------------- -- cgit v1.2.3-24-g4f1b From 2abda9049a8d006673204f56f4680526232b2360 Mon Sep 17 00:00:00 2001 From: George Petculescu Date: Sun, 14 Mar 2021 01:56:30 +0200 Subject: Dropping the possibility that samesite cookie attribute won't be sent; defaults to Lax; all samesite values are ucfirst'ed; log for SameSite=None non-secure cookies --- 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 4ffd83352..596f8fefe 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -396,7 +396,7 @@ $config['cookie_domain'] = ''; $config['cookie_path'] = '/'; $config['cookie_secure'] = FALSE; $config['cookie_httponly'] = FALSE; -$config['cookie_samesite'] = 'lax'; +$config['cookie_samesite'] = 'Lax'; /* |-------------------------------------------------------------------------- -- cgit v1.2.3-24-g4f1b From 76943952919c6c8be3ee3cfad3469d9effa0f4d7 Mon Sep 17 00:00:00 2001 From: ddonatek Date: Tue, 2 Nov 2021 23:53:06 +0100 Subject: Added another SVG mimetype Some MIME detection programs/libraries identify SVG files without `` declaration as `image/svg` --- 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 f5407ff89..b2e989fea 100644 --- a/application/config/mimes.php +++ b/application/config/mimes.php @@ -162,7 +162,7 @@ return array( 'cdr' => array('application/cdr', 'application/coreldraw', 'application/x-cdr', 'application/x-coreldraw', 'image/cdr', 'image/x-cdr', 'zz-application/zz-winassoc-cdr'), 'wma' => array('audio/x-ms-wma', 'video/x-ms-asf'), 'jar' => array('application/java-archive', 'application/x-java-application', 'application/x-jar', 'application/x-compressed'), - 'svg' => array('image/svg+xml', 'application/xml', 'text/xml'), + 'svg' => array('image/svg+xml', 'image/svg', 'application/xml', 'text/xml'), 'vcf' => 'text/x-vcard', 'srt' => array('text/srt', 'text/plain'), 'vtt' => array('text/vtt', 'text/plain'), -- cgit v1.2.3-24-g4f1b From b2af476c9bb3a3eb24f93e7128eee327758461a9 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Wed, 5 Jan 2022 21:27:11 +0200 Subject: Polish changes from PR #5684 and drop ['log_file_extension']; ref #5648 --- application/config/config.php | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) (limited to 'application/config') diff --git a/application/config/config.php b/application/config/config.php index 83d8802fb..1e37856fe 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -232,24 +232,10 @@ $config['log_path'] = ''; |-------------------------------------------------------------------------- | | Leave this BLANK unless you would like to set something other than the default -| 'log-'.date('Y-m-d') filename. No DIRECTORY_SEPARATOR(s) or file extension +| 'log-'.date('Y-m-d').'.php'. No DIRECTORY_SEPARATOR(s), just the filename. | */ -$config['log_file'] = ''; - -/* -|-------------------------------------------------------------------------- -| Log File Extension -|-------------------------------------------------------------------------- -| -| The default filename extension for log files. The default 'php' allows for -| protecting the log files via basic scripting, when they are to be stored -| under a publicly accessible directory. -| -| Note: Leaving it blank will default to 'php'. -| -*/ -$config['log_file_extension'] = ''; +$config['log_filename'] = ''; /* |-------------------------------------------------------------------------- -- cgit v1.2.3-24-g4f1b From f85ee8dd6a94529b6974d826b2018cc42dbd17cb Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Wed, 5 Jan 2022 22:25:38 +0200 Subject: Drop option to disable Query Builder I don't know if it has ever worked properly, too much things break if you do try to disable it. --- application/config/database.php | 5 ----- 1 file changed, 5 deletions(-) (limited to 'application/config') diff --git a/application/config/database.php b/application/config/database.php index 77748959f..43a0d2b1c 100644 --- a/application/config/database.php +++ b/application/config/database.php @@ -66,13 +66,8 @@ defined('BASEPATH') OR exit('No direct script access allowed'); | | The $active_group variable lets you choose which connection group to | make active. By default there is only one group (the 'default' group). -| -| The $query_builder variables lets you determine whether or not to load -| the query builder class. */ $active_group = 'default'; -$query_builder = TRUE; - $db['default'] = array( 'dsn' => '', 'hostname' => 'localhost', -- cgit v1.2.3-24-g4f1b