From ab347586ef289e960ab7cfad32574e526cdcce0b Mon Sep 17 00:00:00 2001 From: Timothy Warren Date: Tue, 23 Aug 2011 12:29:29 -0400 Subject: Got PDO working --- 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 b4b34bf66..5a84a471a 100644 --- a/application/config/database.php +++ b/application/config/database.php @@ -17,7 +17,7 @@ | ['password'] The password used to connect to the database | ['database'] The name of the database you want to connect to | ['dbdriver'] The database type. ie: mysql. Currently supported: - mysql, mysqli, postgre, odbc, mssql, sqlite, oci8 + mysql, mysqli, pdo, postgre, odbc, mssql, sqlite, oci8 | ['dbprefix'] You can add an optional prefix, which will be added | to the table name when using the Active Record class | ['pconnect'] TRUE/FALSE - Whether to use a persistent connection -- cgit v1.2.3-24-g4f1b From d720af7ce5539c0c5f1a604358a96bcf54af80fd Mon Sep 17 00:00:00 2001 From: Bruno Bierbaumer Date: Sat, 27 Aug 2011 16:13:14 +0200 Subject: add Android user agent --- 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 e2d3c3af0..4746f2fcd 100644 --- a/application/config/user_agents.php +++ b/application/config/user_agents.php @@ -126,6 +126,7 @@ $mobiles = array( 'sendo' => "Sendo", // Operating Systems + 'android' => "Android", 'symbian' => "Symbian", 'SymbianOS' => "SymbianOS", 'elaine' => "Palm", -- cgit v1.2.3-24-g4f1b From 8cc0cfe1ab1e10aad71d14e0b43e05444c00693d Mon Sep 17 00:00:00 2001 From: freewil Date: Sat, 27 Aug 2011 21:53:00 -0400 Subject: always use charset config item --- 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 880393c29..a6d10d8dc 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -79,6 +79,8 @@ $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. +| */ $config['charset'] = 'UTF-8'; -- cgit v1.2.3-24-g4f1b From 995af497e636297ce1584c350e97ce67605a2c6d Mon Sep 17 00:00:00 2001 From: mmestrovic Date: Wed, 31 Aug 2011 17:25:27 +0300 Subject: added Windows 7 platform renamed Windows Longhorn to Windows Vista fixed tabs changed order of nt5.1 and nt5.0 platforms --- application/config/user_agents.php | 249 +++++++++++++++++++------------------ 1 file changed, 125 insertions(+), 124 deletions(-) (limited to 'application/config') diff --git a/application/config/user_agents.php b/application/config/user_agents.php index 4746f2fcd..9080b43f6 100644 --- a/application/config/user_agents.php +++ b/application/config/user_agents.php @@ -11,168 +11,169 @@ */ $platforms = array ( - 'windows nt 6.0' => 'Windows Longhorn', + 'windows nt 6.1' => 'Windows 7', + 'windows nt 6.0' => 'Windows Vista', 'windows nt 5.2' => 'Windows 2003', - 'windows nt 5.0' => 'Windows 2000', 'windows nt 5.1' => 'Windows XP', + 'windows nt 5.0' => 'Windows 2000', 'windows nt 4.0' => 'Windows NT 4.0', - 'winnt4.0' => 'Windows NT 4.0', - 'winnt 4.0' => 'Windows NT', - 'winnt' => 'Windows NT', + 'winnt4.0' => 'Windows NT 4.0', + 'winnt 4.0' => 'Windows NT', + 'winnt' => 'Windows NT', 'windows 98' => 'Windows 98', - 'win98' => 'Windows 98', + 'win98' => 'Windows 98', 'windows 95' => 'Windows 95', - 'win95' => 'Windows 95', - 'windows' => 'Unknown Windows OS', - 'os x' => 'Mac OS X', - 'ppc mac' => 'Power PC Mac', - 'freebsd' => 'FreeBSD', - 'ppc' => 'Macintosh', - 'linux' => 'Linux', - 'debian' => 'Debian', - 'sunos' => 'Sun Solaris', - 'beos' => 'BeOS', + 'win95' => 'Windows 95', + 'windows' => 'Unknown Windows OS', + 'os x' => 'Mac OS X', + 'ppc mac' => 'Power PC Mac', + 'freebsd' => 'FreeBSD', + 'ppc' => 'Macintosh', + 'linux' => 'Linux', + 'debian' => 'Debian', + 'sunos' => 'Sun Solaris', + 'beos' => 'BeOS', 'apachebench' => 'ApacheBench', - 'aix' => 'AIX', - 'irix' => 'Irix', - 'osf' => 'DEC OSF', - 'hp-ux' => 'HP-UX', - 'netbsd' => 'NetBSD', - 'bsdi' => 'BSDi', - 'openbsd' => 'OpenBSD', - 'gnu' => 'GNU/Linux', - 'unix' => 'Unknown Unix OS' + 'aix' => 'AIX', + 'irix' => 'Irix', + 'osf' => 'DEC OSF', + 'hp-ux' => 'HP-UX', + 'netbsd' => 'NetBSD', + 'bsdi' => 'BSDi', + 'openbsd' => 'OpenBSD', + 'gnu' => 'GNU/Linux', + 'unix' => 'Unknown Unix OS' ); // 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( - 'Flock' => 'Flock', - 'Chrome' => 'Chrome', - 'Opera' => 'Opera', - 'MSIE' => 'Internet Explorer', + 'Flock' => 'Flock', + 'Chrome' => 'Chrome', + 'Opera' => 'Opera', + 'MSIE' => 'Internet Explorer', 'Internet Explorer' => 'Internet Explorer', - 'Shiira' => 'Shiira', - 'Firefox' => 'Firefox', - 'Chimera' => 'Chimera', - 'Phoenix' => 'Phoenix', - 'Firebird' => 'Firebird', - 'Camino' => 'Camino', - 'Netscape' => 'Netscape', - 'OmniWeb' => 'OmniWeb', - 'Safari' => 'Safari', - 'Mozilla' => 'Mozilla', - 'Konqueror' => 'Konqueror', - 'icab' => 'iCab', - 'Lynx' => 'Lynx', - 'Links' => 'Links', - 'hotjava' => 'HotJava', - 'amaya' => 'Amaya', - 'IBrowse' => 'IBrowse' + 'Shiira' => 'Shiira', + 'Firefox' => 'Firefox', + 'Chimera' => 'Chimera', + 'Phoenix' => 'Phoenix', + 'Firebird' => 'Firebird', + 'Camino' => 'Camino', + 'Netscape' => 'Netscape', + 'OmniWeb' => 'OmniWeb', + 'Safari' => 'Safari', + 'Mozilla' => 'Mozilla', + 'Konqueror' => 'Konqueror', + 'icab' => 'iCab', + 'Lynx' => 'Lynx', + 'Links' => 'Links', + 'hotjava' => 'HotJava', + 'amaya' => 'Amaya', + 'IBrowse' => 'IBrowse' ); $mobiles = array( // legacy array, old values commented out 'mobileexplorer' => 'Mobile Explorer', -// 'openwave' => 'Open Wave', +// 'openwave' => 'Open Wave', // 'opera mini' => 'Opera Mini', -// 'operamini' => 'Opera Mini', -// 'elaine' => 'Palm', +// 'operamini' => 'Opera Mini', +// 'elaine' => 'Palm', 'palmsource' => 'Palm', // 'digital paths' => 'Palm', -// 'avantgo' => 'Avantgo', -// 'xiino' => 'Xiino', - 'palmscape' => 'Palmscape', -// 'nokia' => 'Nokia', -// 'ericsson' => 'Ericsson', +// 'avantgo' => 'Avantgo', +// 'xiino' => 'Xiino', + 'palmscape' => 'Palmscape', +// 'nokia' => 'Nokia', +// 'ericsson' => 'Ericsson', // 'blackberry' => 'BlackBerry', -// 'motorola' => 'Motorola' +// 'motorola' => 'Motorola' // Phones and Manufacturers - 'motorola' => "Motorola", - 'nokia' => "Nokia", - 'palm' => "Palm", - 'iphone' => "Apple iPhone", - 'ipad' => "iPad", - 'ipod' => "Apple iPod Touch", - 'sony' => "Sony Ericsson", - 'ericsson' => "Sony Ericsson", + 'motorola' => "Motorola", + 'nokia' => "Nokia", + 'palm' => "Palm", + 'iphone' => "Apple iPhone", + 'ipad' => "iPad", + 'ipod' => "Apple iPod Touch", + 'sony' => "Sony Ericsson", + 'ericsson' => "Sony Ericsson", 'blackberry' => "BlackBerry", - 'cocoon' => "O2 Cocoon", - 'blazer' => "Treo", - 'lg' => "LG", - 'amoi' => "Amoi", - 'xda' => "XDA", - 'mda' => "MDA", - 'vario' => "Vario", - 'htc' => "HTC", - 'samsung' => "Samsung", - 'sharp' => "Sharp", - 'sie-' => "Siemens", - 'alcatel' => "Alcatel", - 'benq' => "BenQ", - 'ipaq' => "HP iPaq", - 'mot-' => "Motorola", + 'cocoon' => "O2 Cocoon", + 'blazer' => "Treo", + 'lg' => "LG", + 'amoi' => "Amoi", + 'xda' => "XDA", + 'mda' => "MDA", + 'vario' => "Vario", + 'htc' => "HTC", + 'samsung' => "Samsung", + 'sharp' => "Sharp", + 'sie-' => "Siemens", + 'alcatel' => "Alcatel", + 'benq' => "BenQ", + 'ipaq' => "HP iPaq", + 'mot-' => "Motorola", 'playstation portable' => "PlayStation Portable", - 'hiptop' => "Danger Hiptop", - 'nec-' => "NEC", - 'panasonic' => "Panasonic", - 'philips' => "Philips", - 'sagem' => "Sagem", - 'sanyo' => "Sanyo", - 'spv' => "SPV", - 'zte' => "ZTE", - 'sendo' => "Sendo", + 'hiptop' => "Danger Hiptop", + 'nec-' => "NEC", + 'panasonic' => "Panasonic", + 'philips' => "Philips", + 'sagem' => "Sagem", + 'sanyo' => "Sanyo", + 'spv' => "SPV", + 'zte' => "ZTE", + 'sendo' => "Sendo", - // Operating Systems - 'android' => "Android", - 'symbian' => "Symbian", - 'SymbianOS' => "SymbianOS", - 'elaine' => "Palm", - 'palm' => "Palm", - 'series60' => "Symbian S60", - 'windows ce' => "Windows CE", +// Operating Systems + 'android' => "Android", + 'symbian' => "Symbian", + 'SymbianOS' => "SymbianOS", + 'elaine' => "Palm", + 'palm' => "Palm", + 'series60' => "Symbian S60", + 'windows ce' => "Windows CE", // Browsers - 'obigo' => "Obigo", - 'netfront' => "Netfront Browser", - 'openwave' => "Openwave Browser", - 'mobilexplorer' => "Mobile Explorer", - 'operamini' => "Opera Mini", - 'opera mini' => "Opera Mini", + 'obigo' => "Obigo", + 'netfront' => "Netfront Browser", + 'openwave' => "Openwave Browser", + 'mobilexplorer' => "Mobile Explorer", + 'operamini' => "Opera Mini", + 'opera mini' => "Opera Mini", // Other - 'digital paths' => "Digital Paths", - 'avantgo' => "AvantGo", - 'xiino' => "Xiino", - 'novarra' => "Novarra Transcoder", - 'vodafone' => "Vodafone", - 'docomo' => "NTT DoCoMo", - 'o2' => "O2", + 'digital paths' => "Digital Paths", + 'avantgo' => "AvantGo", + 'xiino' => "Xiino", + 'novarra' => "Novarra Transcoder", + 'vodafone' => "Vodafone", + 'docomo' => "NTT DoCoMo", + 'o2' => "O2", // Fallback - 'mobile' => "Generic Mobile", - 'wireless' => "Generic Mobile", - 'j2me' => "Generic Mobile", - 'midp' => "Generic Mobile", - 'cldc' => "Generic Mobile", - 'up.link' => "Generic Mobile", - 'up.browser' => "Generic Mobile", - 'smartphone' => "Generic Mobile", - 'cellphone' => "Generic Mobile" + 'mobile' => "Generic Mobile", + 'wireless' => "Generic Mobile", + 'j2me' => "Generic Mobile", + 'midp' => "Generic Mobile", + 'cldc' => "Generic Mobile", + 'up.link' => "Generic Mobile", + 'up.browser' => "Generic Mobile", + 'smartphone' => "Generic Mobile", + 'cellphone' => "Generic Mobile" ); // There are hundreds of bots but these are the most common. $robots = array( - 'googlebot' => 'Googlebot', - 'msnbot' => 'MSNBot', - 'slurp' => 'Inktomi Slurp', - 'yahoo' => 'Yahoo', - 'askjeeves' => 'AskJeeves', + 'googlebot' => 'Googlebot', + 'msnbot' => 'MSNBot', + 'slurp' => 'Inktomi Slurp', + 'yahoo' => 'Yahoo', + 'askjeeves' => 'AskJeeves', 'fastcrawler' => 'FastCrawler', - 'infoseek' => 'InfoSeek Robot 1.0', - 'lycos' => 'Lycos' + 'infoseek' => 'InfoSeek Robot 1.0', + 'lycos' => 'Lycos' ); /* End of file user_agents.php */ -- cgit v1.2.3-24-g4f1b From cb212c6ad80e85b8d41fea6a5bde26e4272dd223 Mon Sep 17 00:00:00 2001 From: MarcosCoelho Date: Wed, 31 Aug 2011 14:59:19 -0300 Subject: fixes some typo --- application/config/mimes.php | 2 +- application/config/routes.php | 2 +- application/config/smileys.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'application/config') diff --git a/application/config/mimes.php b/application/config/mimes.php index 90a1d18bb..206329fde 100644 --- a/application/config/mimes.php +++ b/application/config/mimes.php @@ -8,7 +8,7 @@ | */ -$mimes = array('hqx' => array('application/mac-binhex40', 'application/mac-binhex', 'application/x-binhex40', 'application/x-mac-binhex40'), +$mimes = array('hqx' => array('application/mac-binhex40', 'application/mac-binhex', 'application/x-binhex40', 'application/x-mac-binhex40'), 'cpt' => 'application/mac-compactpro', 'csv' => array('text/x-comma-separated-values', 'text/comma-separated-values', 'application/octet-stream', 'application/vnd.ms-excel', 'application/x-csv', 'text/x-csv', 'text/csv', 'application/csv', 'application/excel', 'application/vnd.msexcel'), 'bin' => array('application/macbinary', 'application/mac-binary', 'application/octet-stream', 'application/x-binary', 'application/x-macbinary'), diff --git a/application/config/routes.php b/application/config/routes.php index 5f9a58343..f30a0d1f2 100644 --- a/application/config/routes.php +++ b/application/config/routes.php @@ -23,7 +23,7 @@ | RESERVED ROUTES | ------------------------------------------------------------------------- | -| There area two reserved routes: +| There are two reserved routes: | | $route['default_controller'] = 'welcome'; | diff --git a/application/config/smileys.php b/application/config/smileys.php index 25d28b2c4..38f02a9e0 100644 --- a/application/config/smileys.php +++ b/application/config/smileys.php @@ -60,7 +60,7 @@ $smileys = array( ':exclaim:' => array('exclaim.gif', '19', '19', 'excaim'), ':question:' => array('question.gif', '19', '19', 'question') // no comma after last item - ); +); /* End of file smileys.php */ /* Location: ./application/config/smileys.php */ \ No newline at end of file -- cgit v1.2.3-24-g4f1b From 539dcb0b2968a2d83c16b42a20252011152f2e65 Mon Sep 17 00:00:00 2001 From: "Cloudmanic Labs, LLC" Date: Sun, 18 Sep 2011 12:08:56 -0700 Subject: Added support to select the name of the database table you are going to use in Migrations --- application/config/migration.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'application/config') diff --git a/application/config/migration.php b/application/config/migration.php index dba870010..aca052d0c 100644 --- a/application/config/migration.php +++ b/application/config/migration.php @@ -11,6 +11,19 @@ */ $config['migration_enabled'] = FALSE; +/* +|-------------------------------------------------------------------------- +| Migrations table +|-------------------------------------------------------------------------- +| +| This is the name of the table that will store the current migrations state. +| When migrations runs it will store in a database table which migration +| level the system is at. It then compares the migration level in the this +| table to the $config['migration_version'] if they are not the same it +| will migrate up. This must be set. +| +*/ +$config['migration_table'] = 'migrations'; /* |-------------------------------------------------------------------------- -- cgit v1.2.3-24-g4f1b From d1ba8f790eb91deb2898ff19d7827ce86e40ee7c Mon Sep 17 00:00:00 2001 From: "Cloudmanic Labs, LLC" Date: Sun, 18 Sep 2011 12:23:00 -0700 Subject: Migrations: Added a config that allows the system to migration to the latest migration when you load the library. This way you do not have to call migrations anywhere else in your code and can always be at the latest migration --- application/config/migration.php | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'application/config') diff --git a/application/config/migration.php b/application/config/migration.php index aca052d0c..1f532f170 100644 --- a/application/config/migration.php +++ b/application/config/migration.php @@ -25,6 +25,22 @@ $config['migration_enabled'] = FALSE; */ $config['migration_table'] = 'migrations'; + +/* +|-------------------------------------------------------------------------- +| Auto Migrate To Latest +|-------------------------------------------------------------------------- +| +| If this is set to TRUE when you load the migrations class and have +| $config['migration_enabled'] set to TRUE the system will auto migrate +| to your latest migration (whatever $config['migration_version'] is +| set to). This way you do not have to call migrations anywhere else +| in your code to have the latest migration. +| +*/ +$config['migration_auto_latest'] = FALSE; + + /* |-------------------------------------------------------------------------- | Migrations version -- cgit v1.2.3-24-g4f1b From 42430a4c1ecc6d0bdaf5253a469d2b01bb3e69f6 Mon Sep 17 00:00:00 2001 From: cenk Date: Mon, 26 Sep 2011 00:35:25 +0300 Subject: Added XHTML Basic 1.1 (xhtml-basic11) doctype. --- application/config/doctypes.php | 1 + 1 file changed, 1 insertion(+) (limited to 'application/config') diff --git a/application/config/doctypes.php b/application/config/doctypes.php index f7e1d19a2..c9f16eedc 100644 --- a/application/config/doctypes.php +++ b/application/config/doctypes.php @@ -5,6 +5,7 @@ $_doctypes = array( 'xhtml1-strict' => '', 'xhtml1-trans' => '', 'xhtml1-frame' => '', + 'xhtml-basic11' => '', 'html5' => '', 'html4-strict' => '', 'html4-trans' => '', -- cgit v1.2.3-24-g4f1b From d1ecd5cd4ae6ab5d37df9fbda14b93977b9e743c Mon Sep 17 00:00:00 2001 From: Eric Barnes Date: Wed, 5 Oct 2011 08:24:15 -0400 Subject: Changed translation of D and d in foreign chars. Fixes #500 --- 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 14b0d7373..0b037d537 100644 --- a/application/config/foreign_chars.php +++ b/application/config/foreign_chars.php @@ -18,8 +18,8 @@ $foreign_characters = array( '/à|á|â|ã|å|ǻ|ā|ă|ą|ǎ|ª/' => 'a', '/Ç|Ć|Ĉ|Ċ|Č/' => 'C', '/ç|ć|ĉ|ċ|č/' => 'c', - '/Ð|Ď|Đ/' => 'D', - '/ð|ď|đ/' => 'd', + '/Ð|Ď|Đ/' => 'Dj', + '/ð|ď|đ/' => 'dj', '/È|É|Ê|Ë|Ē|Ĕ|Ė|Ę|Ě/' => 'E', '/è|é|ê|ë|ē|ĕ|ė|ę|ě/' => 'e', '/Ĝ|Ğ|Ġ|Ģ/' => 'G', -- cgit v1.2.3-24-g4f1b From bf3c4049d33efc0d7ff731537bb29357d98540f3 Mon Sep 17 00:00:00 2001 From: Bo-Yi Wu Date: Fri, 7 Oct 2011 14:40:15 +0800 Subject: Fix #537 issue: replace new wav mimetype --- 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 206329fde..6f73ae038 100644 --- a/application/config/mimes.php +++ b/application/config/mimes.php @@ -66,7 +66,7 @@ $mimes = array('hqx' => array('application/mac-binhex40', 'application/mac-binhe 'rpm' => 'audio/x-pn-realaudio-plugin', 'ra' => 'audio/x-realaudio', 'rv' => 'video/vnd.rn-realvideo', - 'wav' => 'audio/x-wav', + 'wav' => array('audio/x-wav', 'audio/wave', 'audio/wav'), 'bmp' => array('image/bmp', 'image/x-windows-bmp'), 'gif' => 'image/gif', 'jpeg' => array('image/jpeg', 'image/pjpeg'), @@ -137,4 +137,4 @@ $mimes = array('hqx' => array('application/mac-binhex40', 'application/mac-binhe /* 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