Permalink
Browse files

Update to CodeIgniter to 2.2.6

  • Loading branch information...
thebrandonallen committed Apr 22, 2016
1 parent a2fc932 commit 3fba1ffef121722fee9547aba8586f95791da7a1
Showing with 1,153 additions and 1,138 deletions.
  1. 0 system/.htaccess
  2. +4 −3 system/core/Benchmark.php
  3. +5 −4 system/core/CodeIgniter.php
  4. +9 −13 system/core/Common.php
  5. +8 −7 system/core/Config.php
  6. +5 −4 system/core/Controller.php
  7. +4 −3 system/core/Exceptions.php
  8. +4 −3 system/core/Hooks.php
  9. +20 −3 system/core/Input.php
  10. +4 −3 system/core/Lang.php
  11. +4 −3 system/core/Loader.php
  12. +4 −3 system/core/Model.php
  13. +4 −3 system/core/Output.php
  14. +4 −3 system/core/Router.php
  15. +238 −211 system/core/Security.php
  16. +4 −3 system/core/URI.php
  17. +4 −3 system/core/Utf8.php
  18. +4 −3 system/database/DB.php
  19. +5 −4 system/database/DB_active_rec.php
  20. +4 −3 system/database/DB_cache.php
  21. +4 −3 system/database/DB_driver.php
  22. +5 −4 system/database/DB_forge.php
  23. +4 −3 system/database/DB_result.php
  24. +5 −4 system/database/DB_utility.php
  25. +3 −2 system/database/drivers/cubrid/cubrid_driver.php
  26. +3 −2 system/database/drivers/cubrid/cubrid_forge.php
  27. +3 −2 system/database/drivers/cubrid/cubrid_result.php
  28. +3 −2 system/database/drivers/cubrid/cubrid_utility.php
  29. +4 −3 system/database/drivers/mssql/mssql_driver.php
  30. +4 −3 system/database/drivers/mssql/mssql_forge.php
  31. +4 −3 system/database/drivers/mssql/mssql_result.php
  32. +4 −3 system/database/drivers/mssql/mssql_utility.php
  33. +7 −45 system/database/drivers/mysql/mysql_driver.php
  34. +4 −3 system/database/drivers/mysql/mysql_forge.php
  35. +4 −3 system/database/drivers/mysql/mysql_result.php
  36. +4 −3 system/database/drivers/mysql/mysql_utility.php
  37. +10 −30 system/database/drivers/mysqli/mysqli_driver.php
  38. +4 −3 system/database/drivers/mysqli/mysqli_forge.php
  39. +4 −3 system/database/drivers/mysqli/mysqli_result.php
  40. +4 −3 system/database/drivers/mysqli/mysqli_utility.php
  41. +4 −3 system/database/drivers/oci8/oci8_driver.php
  42. +4 −3 system/database/drivers/oci8/oci8_forge.php
  43. +6 −5 system/database/drivers/oci8/oci8_result.php
  44. +4 −3 system/database/drivers/oci8/oci8_utility.php
  45. +4 −3 system/database/drivers/odbc/odbc_driver.php
  46. +4 −3 system/database/drivers/odbc/odbc_forge.php
  47. +4 −3 system/database/drivers/odbc/odbc_result.php
  48. +4 −3 system/database/drivers/odbc/odbc_utility.php
  49. +9 −9 system/database/drivers/pdo/pdo_driver.php
  50. +3 −2 system/database/drivers/pdo/pdo_forge.php
  51. +3 −2 system/database/drivers/pdo/pdo_result.php
  52. +3 −2 system/database/drivers/pdo/pdo_utility.php
  53. +4 −3 system/database/drivers/postgre/postgre_driver.php
  54. +4 −3 system/database/drivers/postgre/postgre_forge.php
  55. +4 −3 system/database/drivers/postgre/postgre_result.php
  56. +4 −3 system/database/drivers/postgre/postgre_utility.php
  57. +4 −3 system/database/drivers/sqlite/sqlite_driver.php
  58. +4 −3 system/database/drivers/sqlite/sqlite_forge.php
  59. +4 −3 system/database/drivers/sqlite/sqlite_result.php
  60. +4 −3 system/database/drivers/sqlite/sqlite_utility.php
  61. +26 −21 system/database/drivers/sqlsrv/sqlsrv_driver.php
  62. +13 −15 system/database/drivers/sqlsrv/sqlsrv_forge.php
  63. +4 −3 system/database/drivers/sqlsrv/sqlsrv_result.php
  64. +4 −3 system/database/drivers/sqlsrv/sqlsrv_utility.php
  65. +4 −3 system/helpers/array_helper.php
  66. +100 −10 system/helpers/captcha_helper.php
  67. +4 −3 system/helpers/cookie_helper.php
  68. +4 −3 system/helpers/date_helper.php
  69. +4 −3 system/helpers/directory_helper.php
  70. +6 −6 system/helpers/download_helper.php
  71. +4 −3 system/helpers/email_helper.php
  72. +5 −4 system/helpers/file_helper.php
  73. +4 −3 system/helpers/form_helper.php
  74. +4 −3 system/helpers/html_helper.php
  75. +4 −3 system/helpers/inflector_helper.php
  76. +4 −3 system/helpers/language_helper.php
  77. +4 −3 system/helpers/number_helper.php
  78. +4 −3 system/helpers/path_helper.php
  79. +4 −3 system/helpers/security_helper.php
  80. +4 −3 system/helpers/smiley_helper.php
  81. +4 −3 system/helpers/string_helper.php
  82. +4 −12 system/helpers/text_helper.php
  83. +4 −3 system/helpers/typography_helper.php
  84. +4 −3 system/helpers/url_helper.php
  85. +4 −3 system/helpers/xml_helper.php
  86. +1 −1 system/language/english/date_lang.php
  87. +1 −1 system/language/english/ftp_lang.php
  88. +22 −22 system/libraries/Cache/Cache.php
  89. +20 −24 system/libraries/Cache/drivers/Cache_apc.php
  90. +5 −8 system/libraries/Cache/drivers/Cache_dummy.php
  91. +21 −23 system/libraries/Cache/drivers/Cache_file.php
  92. +21 −25 system/libraries/Cache/drivers/Cache_memcached.php
  93. +10 −0 system/libraries/Cache/drivers/index.html
  94. +10 −0 system/libraries/Cache/index.html
  95. +4 −3 system/libraries/Calendar.php
  96. +4 −4 system/libraries/Cart.php
  97. +4 −5 system/libraries/Driver.php
  98. +8 −7 system/libraries/Email.php
  99. +19 −65 system/libraries/Encrypt.php
  100. +4 −3 system/libraries/Form_validation.php
  101. +4 −4 system/libraries/Ftp.php
  102. +4 −3 system/libraries/Image_lib.php
  103. +4 −3 system/libraries/Javascript.php
  104. +4 −3 system/libraries/Log.php
  105. +119 −218 system/libraries/Migration.php
  106. +4 −3 system/libraries/Pagination.php
  107. +4 −3 system/libraries/Parser.php
  108. +4 −3 system/libraries/Profiler.php
  109. +45 −31 system/libraries/Session.php
  110. +4 −3 system/libraries/Sha1.php
  111. +4 −3 system/libraries/Table.php
  112. +4 −3 system/libraries/Trackback.php
  113. +4 −5 system/libraries/Typography.php
  114. +4 −3 system/libraries/Unit_test.php
  115. +11 −38 system/libraries/Upload.php
  116. +4 −3 system/libraries/User_agent.php
  117. +4 −3 system/libraries/Xmlrpc.php
  118. +4 −3 system/libraries/Xmlrpcs.php
  119. +4 −3 system/libraries/Zip.php
  120. +11 −10 system/libraries/javascript/Jquery.php
  121. +10 −0 system/libraries/javascript/index.html
View
0 system/.htaccess 100644 → 100755
No changes.
@@ -5,8 +5,9 @@
* An open source application development framework for PHP 5.1.6 or newer
*
* @package CodeIgniter
* @author ExpressionEngine Dev Team
* @copyright Copyright (c) 2008 - 2011, EllisLab, Inc.
* @author EllisLab Dev Team
* @copyright Copyright (c) 2008 - 2014, EllisLab, Inc.
* @copyright Copyright (c) 2014 - 2015, British Columbia Institute of Technology (http://bcit.ca/)
* @license http://codeigniter.com/user_guide/license.html
* @link http://codeigniter.com
* @since Version 1.0
@@ -24,7 +25,7 @@
* @package CodeIgniter
* @subpackage Libraries
* @category Libraries
* @author ExpressionEngine Dev Team
* @author EllisLab Dev Team
* @link http://codeigniter.com/user_guide/libraries/benchmark.html
*/
class CI_Benchmark {
@@ -5,8 +5,9 @@
* An open source application development framework for PHP 5.1.6 or newer
*
* @package CodeIgniter
* @author ExpressionEngine Dev Team
* @copyright Copyright (c) 2008 - 2011, EllisLab, Inc.
* @author EllisLab Dev Team
* @copyright Copyright (c) 2008 - 2014, EllisLab, Inc.
* @copyright Copyright (c) 2014 - 2015, British Columbia Institute of Technology (http://bcit.ca/)
* @license http://codeigniter.com/user_guide/license.html
* @link http://codeigniter.com
* @since Version 1.0
@@ -23,7 +24,7 @@
* @package CodeIgniter
* @subpackage codeigniter
* @category Front-controller
* @author ExpressionEngine Dev Team
* @author EllisLab Dev Team
* @link http://codeigniter.com/user_guide/
*/
@@ -33,7 +34,7 @@
* @var string
*
*/
define('CI_VERSION', '2.1.4');
define('CI_VERSION', '2.2.6');
/**
* CodeIgniter Branch (Core = TRUE, Reactor = FALSE)
View
@@ -5,8 +5,9 @@
* An open source application development framework for PHP 5.1.6 or newer
*
* @package CodeIgniter
* @author ExpressionEngine Dev Team
* @copyright Copyright (c) 2008 - 2011, EllisLab, Inc.
* @author EllisLab Dev Team
* @copyright Copyright (c) 2008 - 2014, EllisLab, Inc.
* @copyright Copyright (c) 2014 - 2015, British Columbia Institute of Technology (http://bcit.ca/)
* @license http://codeigniter.com/user_guide/license.html
* @link http://codeigniter.com
* @since Version 1.0
@@ -23,7 +24,7 @@
* @package CodeIgniter
* @subpackage codeigniter
* @category Common Functions
* @author ExpressionEngine Dev Team
* @author EllisLab Dev Team
* @link http://codeigniter.com/user_guide/
*/
@@ -32,9 +33,6 @@
/**
* Determines if the current version of PHP is greater then the supplied value
*
* Since there are a few places where we conditionally test for PHP > 5
* we'll set a static variable.
*
* @access public
* @param string
* @return bool TRUE if the current version is $version or higher
@@ -254,7 +252,8 @@ function &get_config($replace = array())
}
}
return $_config[0] =& $config;
$_config[0] =& $config;
return $_config[0];
}
}
@@ -470,9 +469,6 @@ function _exception_handler($severity, $message, $filepath, $line)
{
// We don't bother with "strict" notices since they tend to fill up
// the log file with excess information that isn't normally very helpful.
// For example, if you are running PHP 5 and you use version 4 style
// class functions (without prefixes like "public", "private", etc.)
// you'll get notices telling you that these have been deprecated.
if ($severity == E_STRICT)
{
return;
@@ -514,16 +510,16 @@ function _exception_handler($severity, $message, $filepath, $line)
function remove_invisible_characters($str, $url_encoded = TRUE)
{
$non_displayables = array();
// every control character except newline (dec 10)
// carriage return (dec 13), and horizontal tab (dec 09)
if ($url_encoded)
{
$non_displayables[] = '/%0[0-8bcef]/'; // url encoded 00-08, 11, 12, 14, 15
$non_displayables[] = '/%1[0-9a-f]/'; // url encoded 16-31
}
$non_displayables[] = '/[\x00-\x08\x0B\x0C\x0E-\x1F\x7F]+/S'; // 00-08, 11, 12, 14-31, 127
do
View
@@ -5,8 +5,9 @@
* An open source application development framework for PHP 5.1.6 or newer
*
* @package CodeIgniter
* @author ExpressionEngine Dev Team
* @copyright Copyright (c) 2008 - 2011, EllisLab, Inc.
* @author EllisLab Dev Team
* @copyright Copyright (c) 2008 - 2014, EllisLab, Inc.
* @copyright Copyright (c) 2014 - 2015, British Columbia Institute of Technology (http://bcit.ca/)
* @license http://codeigniter.com/user_guide/license.html
* @link http://codeigniter.com
* @since Version 1.0
@@ -23,7 +24,7 @@
* @package CodeIgniter
* @subpackage Libraries
* @category Libraries
* @author ExpressionEngine Dev Team
* @author EllisLab Dev Team
* @link http://codeigniter.com/user_guide/libraries/config.html
*/
class CI_Config {
@@ -66,11 +67,11 @@ function __construct()
// Set the base_url automatically if none was provided
if ($this->config['base_url'] == '')
{
if (isset($_SERVER['HTTP_HOST']))
if (isset($_SERVER['SERVER_ADDR']))
{
$base_url = isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) !== 'off' ? 'https' : 'http';
$base_url .= '://'. $_SERVER['HTTP_HOST'];
$base_url .= str_replace(basename($_SERVER['SCRIPT_NAME']), '', $_SERVER['SCRIPT_NAME']);
$base_url = (empty($_SERVER['HTTPS']) OR strtolower($_SERVER['HTTPS']) === 'off') ? 'http' : 'https';
$base_url .= '://'.$_SERVER['SERVER_ADDR'];
$base_url .= substr($_SERVER['SCRIPT_NAME'], 0, strpos($_SERVER['SCRIPT_NAME'], basename($_SERVER['SCRIPT_FILENAME'])));
}
else
@@ -5,8 +5,9 @@
* An open source application development framework for PHP 5.1.6 or newer
*
* @package CodeIgniter
* @author ExpressionEngine Dev Team
* @copyright Copyright (c) 2008 - 2011, EllisLab, Inc.
* @author EllisLab Dev Team
* @copyright Copyright (c) 2008 - 2014, EllisLab, Inc.
* @copyright Copyright (c) 2014 - 2015, British Columbia Institute of Technology (http://bcit.ca/)
* @license http://codeigniter.com/user_guide/license.html
* @link http://codeigniter.com
* @since Version 1.0
@@ -24,7 +25,7 @@
* @package CodeIgniter
* @subpackage Libraries
* @category Libraries
* @author ExpressionEngine Dev Team
* @author EllisLab Dev Team
* @link http://codeigniter.com/user_guide/general/controllers.html
*/
class CI_Controller {
@@ -37,7 +38,7 @@ class CI_Controller {
public function __construct()
{
self::$instance =& $this;
// Assign all the class objects that were instantiated by the
// bootstrap file (CodeIgniter.php) to local class variables
// so that CI can run as one big super object.
@@ -5,8 +5,9 @@
* An open source application development framework for PHP 5.1.6 or newer
*
* @package CodeIgniter
* @author ExpressionEngine Dev Team
* @copyright Copyright (c) 2008 - 2011, EllisLab, Inc.
* @author EllisLab Dev Team
* @copyright Copyright (c) 2008 - 2014, EllisLab, Inc.
* @copyright Copyright (c) 2014 - 2015, British Columbia Institute of Technology (http://bcit.ca/)
* @license http://codeigniter.com/user_guide/license.html
* @link http://codeigniter.com
* @since Version 1.0
@@ -21,7 +22,7 @@
* @package CodeIgniter
* @subpackage Libraries
* @category Exceptions
* @author ExpressionEngine Dev Team
* @author EllisLab Dev Team
* @link http://codeigniter.com/user_guide/libraries/exceptions.html
*/
class CI_Exceptions {
View
@@ -5,8 +5,9 @@
* An open source application development framework for PHP 5.1.6 or newer
*
* @package CodeIgniter
* @author ExpressionEngine Dev Team
* @copyright Copyright (c) 2008 - 2011, EllisLab, Inc.
* @author EllisLab Dev Team
* @copyright Copyright (c) 2008 - 2014, EllisLab, Inc.
* @copyright Copyright (c) 2014 - 2015, British Columbia Institute of Technology (http://bcit.ca/)
* @license http://codeigniter.com/user_guide/license.html
* @link http://codeigniter.com
* @since Version 1.0
@@ -23,7 +24,7 @@
* @package CodeIgniter
* @subpackage Libraries
* @category Libraries
* @author ExpressionEngine Dev Team
* @author EllisLab Dev Team
* @link http://codeigniter.com/user_guide/libraries/encryption.html
*/
class CI_Hooks {
View
@@ -5,8 +5,9 @@
* An open source application development framework for PHP 5.1.6 or newer
*
* @package CodeIgniter
* @author ExpressionEngine Dev Team
* @copyright Copyright (c) 2008 - 2011, EllisLab, Inc.
* @author EllisLab Dev Team
* @copyright Copyright (c) 2008 - 2014, EllisLab, Inc.
* @copyright Copyright (c) 2014 - 2015, British Columbia Institute of Technology (http://bcit.ca/)
* @license http://codeigniter.com/user_guide/license.html
* @link http://codeigniter.com
* @since Version 1.0
@@ -23,7 +24,7 @@
* @package CodeIgniter
* @subpackage Libraries
* @category Input
* @author ExpressionEngine Dev Team
* @author EllisLab Dev Team
* @link http://codeigniter.com/user_guide/libraries/input.html
*/
class CI_Input {
@@ -631,8 +632,24 @@ function _sanitize_globals()
unset($_COOKIE['$Path']);
unset($_COOKIE['$Domain']);
// Work-around for PHP bug #66827 (https://bugs.php.net/bug.php?id=66827)
//
// The session ID sanitizer doesn't check for the value type and blindly does
// an implicit cast to string, which triggers an 'Array to string' E_NOTICE.
$sess_cookie_name = config_item('cookie_prefix').config_item('sess_cookie_name');
if (isset($_COOKIE[$sess_cookie_name]) && ! is_string($_COOKIE[$sess_cookie_name]))
{
unset($_COOKIE[$sess_cookie_name]);
}
foreach ($_COOKIE as $key => $val)
{
// _clean_input_data() has been reported to break encrypted cookies
if ($key === $sess_cookie_name && config_item('sess_encrypt_cookie'))
{
continue;
}
$_COOKIE[$this->_clean_input_keys($key)] = $this->_clean_input_data($val);
}
}
View
@@ -5,8 +5,9 @@
* An open source application development framework for PHP 5.1.6 or newer
*
* @package CodeIgniter
* @author ExpressionEngine Dev Team
* @copyright Copyright (c) 2008 - 2011, EllisLab, Inc.
* @author EllisLab Dev Team
* @copyright Copyright (c) 2008 - 2014, EllisLab, Inc.
* @copyright Copyright (c) 2014 - 2015, British Columbia Institute of Technology (http://bcit.ca/)
* @license http://codeigniter.com/user_guide/license.html
* @link http://codeigniter.com
* @since Version 1.0
@@ -21,7 +22,7 @@
* @package CodeIgniter
* @subpackage Libraries
* @category Language
* @author ExpressionEngine Dev Team
* @author EllisLab Dev Team
* @link http://codeigniter.com/user_guide/libraries/language.html
*/
class CI_Lang {
View
@@ -5,8 +5,9 @@
* An open source application development framework for PHP 5.1.6 or newer
*
* @package CodeIgniter
* @author ExpressionEngine Dev Team
* @copyright Copyright (c) 2008 - 2011, EllisLab, Inc.
* @author EllisLab Dev Team
* @copyright Copyright (c) 2008 - 2014, EllisLab, Inc.
* @copyright Copyright (c) 2014 - 2015, British Columbia Institute of Technology (http://bcit.ca/)
* @license http://codeigniter.com/user_guide/license.html
* @link http://codeigniter.com
* @since Version 1.0
@@ -22,7 +23,7 @@
*
* @package CodeIgniter
* @subpackage Libraries
* @author ExpressionEngine Dev Team
* @author EllisLab Dev Team
* @category Loader
* @link http://codeigniter.com/user_guide/libraries/loader.html
*/
View
@@ -5,8 +5,9 @@
* An open source application development framework for PHP 5.1.6 or newer
*
* @package CodeIgniter
* @author ExpressionEngine Dev Team
* @copyright Copyright (c) 2008 - 2011, EllisLab, Inc.
* @author EllisLab Dev Team
* @copyright Copyright (c) 2008 - 2014, EllisLab, Inc.
* @copyright Copyright (c) 2014 - 2015, British Columbia Institute of Technology (http://bcit.ca/)
* @license http://codeigniter.com/user_guide/license.html
* @link http://codeigniter.com
* @since Version 1.0
@@ -21,7 +22,7 @@
* @package CodeIgniter
* @subpackage Libraries
* @category Libraries
* @author ExpressionEngine Dev Team
* @author EllisLab Dev Team
* @link http://codeigniter.com/user_guide/libraries/config.html
*/
class CI_Model {
View
@@ -5,8 +5,9 @@
* An open source application development framework for PHP 5.1.6 or newer
*
* @package CodeIgniter
* @author ExpressionEngine Dev Team
* @copyright Copyright (c) 2008 - 2011, EllisLab, Inc.
* @author EllisLab Dev Team
* @copyright Copyright (c) 2008 - 2014, EllisLab, Inc.
* @copyright Copyright (c) 2014 - 2015, British Columbia Institute of Technology (http://bcit.ca/)
* @license http://codeigniter.com/user_guide/license.html
* @link http://codeigniter.com
* @since Version 1.0
@@ -23,7 +24,7 @@
* @package CodeIgniter
* @subpackage Libraries
* @category Output
* @author ExpressionEngine Dev Team
* @author EllisLab Dev Team
* @link http://codeigniter.com/user_guide/libraries/output.html
*/
class CI_Output {
View
@@ -5,8 +5,9 @@
* An open source application development framework for PHP 5.1.6 or newer
*
* @package CodeIgniter
* @author ExpressionEngine Dev Team
* @copyright Copyright (c) 2008 - 2011, EllisLab, Inc.
* @author EllisLab Dev Team
* @copyright Copyright (c) 2008 - 2014, EllisLab, Inc.
* @copyright Copyright (c) 2014 - 2015, British Columbia Institute of Technology (http://bcit.ca/)
* @license http://codeigniter.com/user_guide/license.html
* @link http://codeigniter.com
* @since Version 1.0
@@ -22,7 +23,7 @@
*
* @package CodeIgniter
* @subpackage Libraries
* @author ExpressionEngine Dev Team
* @author EllisLab Dev Team
* @category Libraries
* @link http://codeigniter.com/user_guide/general/routing.html
*/
Oops, something went wrong.

0 comments on commit 3fba1ff

Please sign in to comment.