Skip to content

Commit a1e1a98

Browse files
committed
Configs Update
Main config, doctypes, foreign chars, hooks, mimes, user agents.
1 parent caedbdf commit a1e1a98

6 files changed

Lines changed: 76 additions & 53 deletions

File tree

ForgeIgniter/config/config.php

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
<?php defined('BASEPATH') OR exit('No direct script access allowed');
1+
<?php
2+
defined('BASEPATH') OR exit('No direct script access allowed');
23

34
/*
45
|--------------------------------------------------------------------------
@@ -400,10 +401,11 @@
400401
| 'cookie_httponly') will also affect sessions.
401402
|
402403
*/
403-
$config['cookie_prefix'] = "";
404-
$config['cookie_domain'] = "";
405-
$config['cookie_path'] = "/";
404+
$config['cookie_prefix'] = '';
405+
$config['cookie_domain'] = '';
406+
$config['cookie_path'] = '/';
406407
$config['cookie_secure'] = FALSE;
408+
$config['cookie_httponly'] = FALSE;
407409

408410
/*
409411
|--------------------------------------------------------------------------

ForgeIgniter/config/doctypes.php

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,24 @@
1-
<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
1+
<?php
2+
defined('BASEPATH') OR exit('No direct script access allowed');
23

34
$_doctypes = array(
4-
'xhtml11' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">',
5-
'xhtml1-strict' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">',
6-
'xhtml1-trans' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">',
7-
'xhtml1-frame' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">',
8-
'xhtml-basic11' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML Basic 1.1//EN" "http://www.w3.org/TR/xhtml-basic/xhtml-basic11.dtd">',
9-
'html5' => '<!DOCTYPE html>',
10-
'html4-strict' => '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">',
11-
'html4-trans' => '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">',
12-
'html4-frame' => '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">',
13-
'mathml1' => '<!DOCTYPE math SYSTEM "http://www.w3.org/Math/DTD/mathml1/mathml.dtd">',
14-
'mathml2' => '<!DOCTYPE math PUBLIC "-//W3C//DTD MathML 2.0//EN" "http://www.w3.org/Math/DTD/mathml2/mathml2.dtd">',
15-
'svg10' => '<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">',
16-
'svg11' => '<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">',
17-
'svg11-basic' => '<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Basic//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-basic.dtd">',
18-
'svg11-tiny' => '<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">',
5+
'xhtml11' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">',
6+
'xhtml1-strict' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">',
7+
'xhtml1-trans' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">',
8+
'xhtml1-frame' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">',
9+
'xhtml-basic11' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML Basic 1.1//EN" "http://www.w3.org/TR/xhtml-basic/xhtml-basic11.dtd">',
10+
'html5' => '<!DOCTYPE html>',
11+
'html4-strict' => '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">',
12+
'html4-trans' => '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">',
13+
'html4-frame' => '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">',
14+
'mathml1' => '<!DOCTYPE math SYSTEM "http://www.w3.org/Math/DTD/mathml1/mathml.dtd">',
15+
'mathml2' => '<!DOCTYPE math PUBLIC "-//W3C//DTD MathML 2.0//EN" "http://www.w3.org/Math/DTD/mathml2/mathml2.dtd">',
16+
'svg10' => '<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">',
17+
'svg11' => '<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">',
18+
'svg11-basic' => '<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Basic//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-basic.dtd">',
19+
'svg11-tiny' => '<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">',
1920
'xhtml-math-svg-xh' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN" "http://www.w3.org/2002/04/xhtml-math-svg/xhtml-math-svg.dtd">',
2021
'xhtml-math-svg-sh' => '<!DOCTYPE svg:svg PUBLIC "-//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN" "http://www.w3.org/2002/04/xhtml-math-svg/xhtml-math-svg.dtd">',
21-
'xhtml-rdfa-1' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.0//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-1.dtd">',
22-
'xhtml-rdfa-2' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.1//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-2.dtd">'
23-
);
24-
25-
/* End of file doctypes.php */
26-
/* Location: ./ForgeIgniter/config/doctypes.php */
22+
'xhtml-rdfa-1' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.0//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-1.dtd">',
23+
'xhtml-rdfa-2' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.1//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-2.dtd">'
24+
);

ForgeIgniter/config/foreign_chars.php

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
1+
<?php
2+
defined('BASEPATH') OR exit('No direct script access allowed');
3+
24
/*
35
| -------------------------------------------------------------------
46
| Foreign Characters
@@ -57,8 +59,8 @@
5759
'/Þ|þ/' => 'th',
5860
'/Ù|Ú|Û|Ũ|Ū|Ŭ|Ů|Ű|Ų|Ư|Ǔ|Ǖ|Ǘ|Ǚ|Ǜ|Ũ|Ủ|Ụ|Ừ|Ứ|Ữ|Ử|Ự|У/' => 'U',
5961
'/ù|ú|û|ũ|ū|ŭ|ů|ű|ų|ư|ǔ|ǖ|ǘ|ǚ|ǜ|υ|ύ|ϋ|ủ|ụ|ừ|ứ|ữ|ử|ự|у/' => 'u',
60-
'/Ý|Ÿ|Ŷ|Υ|Ύ|Ϋ|Ỳ|Ỹ|Ỷ|Ỵ|Й/' => 'Y',
61-
'/ý|ÿ|ŷ|ỳ|ỹ|ỷ|ỵ|й/' => 'y',
62+
'/Ƴ|Ɏ|Ỵ|Ẏ|Ӳ|Ӯ|Ў|Ý|Ÿ|Ŷ|Υ|Ύ|Ϋ|Ỳ|Ỹ|Ỷ|Ỵ|Й/' => 'Y',
63+
'/ẙ|ʏ|ƴ|ɏ|ỵ|ẏ|ӳ|ӯ|ў|ý|ÿ|ŷ|ỳ|ỹ|ỷ|ỵ|й/' => 'y',
6264
'/В/' => 'V',
6365
'/в/' => 'v',
6466
'/Ŵ/' => 'W',
@@ -99,6 +101,3 @@
99101
'/Я/' => 'Ya',
100102
'/я/' => 'ya'
101103
);
102-
103-
/* End of file foreign_chars.php */
104-
/* Location: ./ForgeIgniter/config/foreign_chars.php */

ForgeIgniter/config/hooks.php

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
1-
<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
1+
<?php
2+
defined('BASEPATH') OR exit('No direct script access allowed');
3+
24
/*
35
| -------------------------------------------------------------------------
46
| Hooks
57
| -------------------------------------------------------------------------
68
| This file lets you define "hooks" to extend CI without hacking the core
79
| files. Please see the user guide for info:
810
|
9-
| http://www.codeigniter.com/userguide2/general/hooks.html
11+
| https://codeigniter.com/user_guide/general/hooks.html
1012
|
1113
*/
12-
13-
14-
15-
/* End of file hooks.php */
16-
/* Location: ./ForgeIgniter/config/hooks.php */

ForgeIgniter/config/mimes.php

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,13 +155,30 @@
155155
'ics' => 'text/calendar',
156156
'ical' => 'text/calendar',
157157
'zsh' => 'text/x-scriptzsh',
158-
'7zip' => array('application/x-compressed', 'application/x-zip-compressed', 'application/zip', 'multipart/x-zip'),
158+
'7z' => array('application/x-7z-compressed', 'application/x-compressed', 'application/x-zip-compressed', 'application/zip', 'multipart/x-zip'),
159+
'7zip' => array('application/x-7z-compressed', 'application/x-compressed', 'application/x-zip-compressed', 'application/zip', 'multipart/x-zip'),
159160
'cdr' => array('application/cdr', 'application/coreldraw', 'application/x-cdr', 'application/x-coreldraw', 'image/cdr', 'image/x-cdr', 'zz-application/zz-winassoc-cdr'),
160161
'wma' => array('audio/x-ms-wma', 'video/x-ms-asf'),
161162
'jar' => array('application/java-archive', 'application/x-java-application', 'application/x-jar', 'application/x-compressed'),
162163
'svg' => array('image/svg+xml', 'application/xml', 'text/xml'),
163164
'vcf' => 'text/x-vcard',
164165
'srt' => array('text/srt', 'text/plain'),
165166
'vtt' => array('text/vtt', 'text/plain'),
166-
'ico' => array('image/x-icon', 'image/x-ico', 'image/vnd.microsoft.icon')
167+
'ico' => array('image/x-icon', 'image/x-ico', 'image/vnd.microsoft.icon'),
168+
'odc' => 'application/vnd.oasis.opendocument.chart',
169+
'otc' => 'application/vnd.oasis.opendocument.chart-template',
170+
'odf' => 'application/vnd.oasis.opendocument.formula',
171+
'otf' => 'application/vnd.oasis.opendocument.formula-template',
172+
'odg' => 'application/vnd.oasis.opendocument.graphics',
173+
'otg' => 'application/vnd.oasis.opendocument.graphics-template',
174+
'odi' => 'application/vnd.oasis.opendocument.image',
175+
'oti' => 'application/vnd.oasis.opendocument.image-template',
176+
'odp' => 'application/vnd.oasis.opendocument.presentation',
177+
'otp' => 'application/vnd.oasis.opendocument.presentation-template',
178+
'ods' => 'application/vnd.oasis.opendocument.spreadsheet',
179+
'ots' => 'application/vnd.oasis.opendocument.spreadsheet-template',
180+
'odt' => 'application/vnd.oasis.opendocument.text',
181+
'odm' => 'application/vnd.oasis.opendocument.text-master',
182+
'ott' => 'application/vnd.oasis.opendocument.text-template',
183+
'oth' => 'application/vnd.oasis.opendocument.text-web'
167184
);

ForgeIgniter/config/user_agents.php

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
1+
<?php
2+
defined('BASEPATH') OR exit('No direct script access allowed');
3+
24
/*
35
| -------------------------------------------------------------------
46
| USER AGENT TYPES
57
| -------------------------------------------------------------------
6-
| This file contains four arrays of user agent data. It is used by the
8+
| This file contains four arrays of user agent data. It is used by the
79
| User Agent Class to help identify browser, platform, robot, and
8-
| mobile device data. The array keys are used to identify the device
10+
| mobile device data. The array keys are used to identify the device
911
| and the array values are used to set the actual name of the item.
10-
|
1112
*/
12-
1313
$platforms = array(
1414
'windows nt 10.0' => 'Windows 10',
1515
'windows nt 6.3' => 'Windows 8.1',
@@ -54,12 +54,14 @@
5454
'unix' => 'Unknown Unix OS',
5555
'symbian' => 'Symbian OS'
5656
);
57+
58+
5759
// The order of this array should NOT be changed. Many browsers return
5860
// multiple browser types so we want to identify the sub-type first.
5961
$browsers = array(
6062
'OPR' => 'Opera',
6163
'Flock' => 'Flock',
62-
'Edge' => 'Spartan',
64+
'Edge' => 'Edge',
6365
'Chrome' => 'Chrome',
6466
// Opera 10+ always reports Opera/9.80 and appends Version/<real version> to the user agent string
6567
'Opera.*?Version' => 'Opera',
@@ -85,8 +87,10 @@
8587
'amaya' => 'Amaya',
8688
'IBrowse' => 'IBrowse',
8789
'Maxthon' => 'Maxthon',
88-
'Ubuntu' => 'Ubuntu Web Browser'
90+
'Ubuntu' => 'Ubuntu Web Browser',
91+
'Vivaldi' => 'Vivaldi'
8992
);
93+
9094
$mobiles = array(
9195
// legacy array, old values commented out
9296
'mobileexplorer' => 'Mobile Explorer',
@@ -103,6 +107,7 @@
103107
// 'ericsson' => 'Ericsson',
104108
// 'blackberry' => 'BlackBerry',
105109
// 'motorola' => 'Motorola'
110+
106111
// Phones and Manufacturers
107112
'motorola' => 'Motorola',
108113
'nokia' => 'Nokia',
@@ -146,13 +151,15 @@
146151
'wii' => 'Nintendo Wii',
147152
'open web' => 'Open Web',
148153
'openweb' => 'OpenWeb',
154+
149155
// Operating Systems
150156
'android' => 'Android',
151157
'symbian' => 'Symbian',
152158
'SymbianOS' => 'SymbianOS',
153159
'elaine' => 'Palm',
154160
'series60' => 'Symbian S60',
155161
'windows ce' => 'Windows CE',
162+
156163
// Browsers
157164
'obigo' => 'Obigo',
158165
'netfront' => 'Netfront Browser',
@@ -162,6 +169,7 @@
162169
'opera mini' => 'Opera Mini',
163170
'opera mobi' => 'Opera Mobile',
164171
'fennec' => 'Firefox Mobile',
172+
165173
// Other
166174
'digital paths' => 'Digital Paths',
167175
'avantgo' => 'AvantGo',
@@ -170,6 +178,7 @@
170178
'vodafone' => 'Vodafone',
171179
'docomo' => 'NTT DoCoMo',
172180
'o2' => 'O2',
181+
173182
// Fallback
174183
'mobile' => 'Generic Mobile',
175184
'wireless' => 'Generic Mobile',
@@ -181,6 +190,7 @@
181190
'smartphone' => 'Generic Mobile',
182191
'cellphone' => 'Generic Mobile'
183192
);
193+
184194
// There are hundreds of bots but these are the most common.
185195
$robots = array(
186196
'googlebot' => 'Googlebot',
@@ -189,7 +199,7 @@
189199
'bingbot' => 'Bing',
190200
'slurp' => 'Inktomi Slurp',
191201
'yahoo' => 'Yahoo',
192-
'askjeeves' => 'AskJeeves',
202+
'ask jeeves' => 'Ask Jeeves',
193203
'fastcrawler' => 'FastCrawler',
194204
'infoseek' => 'InfoSeek Robot 1.0',
195205
'lycos' => 'Lycos',
@@ -198,8 +208,8 @@
198208
'CRAZYWEBCRAWLER' => 'Crazy Webcrawler',
199209
'adsbot-google' => 'AdsBot Google',
200210
'feedfetcher-google' => 'Feedfetcher Google',
201-
'curious george' => 'Curious George'
211+
'curious george' => 'Curious George',
212+
'ia_archiver' => 'Alexa Crawler',
213+
'MJ12bot' => 'Majestic-12',
214+
'Uptimebot' => 'Uptimebot'
202215
);
203-
204-
/* End of file user_agents.php */
205-
/* Location: ./ForgeIgniter/config/user_agents.php */

0 commit comments

Comments
 (0)