Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Update codeigniter to 2.1.4

  • Loading branch information...
commit 11a4afb4f3c92933ece85cf36431c7c97ae3fc02 1 parent 6ba94cf
Marco Pedraza authored
Showing with 10 additions and 11 deletions.
  1. 0  index.php
  2. +1 −1  system/core/CodeIgniter.php
  3. 0  system/core/Common.php
  4. 0  system/core/Controller.php
  5. 0  system/core/Loader.php
  6. +6 −7 system/core/Security.php
  7. 0  system/core/Utf8.php
  8. 0  system/core/index.html
  9. +1 −1  system/database/DB_active_rec.php
  10. 0  system/database/DB_cache.php
  11. 0  system/database/DB_driver.php
  12. 0  system/database/DB_forge.php
  13. 0  system/database/DB_result.php
  14. 0  system/database/DB_utility.php
  15. 0  system/database/drivers/cubrid/cubrid_driver.php
  16. 0  system/database/drivers/cubrid/cubrid_forge.php
  17. 0  system/database/drivers/cubrid/cubrid_result.php
  18. 0  system/database/drivers/cubrid/cubrid_utility.php
  19. 0  system/database/drivers/cubrid/index.html
  20. 0  system/database/drivers/index.html
  21. 0  system/database/drivers/mssql/index.html
  22. 0  system/database/drivers/mssql/mssql_driver.php
  23. 0  system/database/drivers/mssql/mssql_forge.php
  24. 0  system/database/drivers/mssql/mssql_result.php
  25. 0  system/database/drivers/mssql/mssql_utility.php
  26. 0  system/database/drivers/mysql/index.html
  27. 0  system/database/drivers/mysql/mysql_driver.php
  28. 0  system/database/drivers/mysql/mysql_forge.php
  29. 0  system/database/drivers/mysql/mysql_result.php
  30. 0  system/database/drivers/mysql/mysql_utility.php
  31. 0  system/database/drivers/mysqli/index.html
  32. 0  system/database/drivers/mysqli/mysqli_driver.php
  33. 0  system/database/drivers/mysqli/mysqli_forge.php
  34. 0  system/database/drivers/mysqli/mysqli_result.php
  35. 0  system/database/drivers/mysqli/mysqli_utility.php
  36. 0  system/database/drivers/oci8/index.html
  37. 0  system/database/drivers/oci8/oci8_driver.php
  38. 0  system/database/drivers/oci8/oci8_forge.php
  39. 0  system/database/drivers/oci8/oci8_result.php
  40. 0  system/database/drivers/oci8/oci8_utility.php
  41. 0  system/database/drivers/odbc/index.html
  42. 0  system/database/drivers/odbc/odbc_driver.php
  43. 0  system/database/drivers/odbc/odbc_forge.php
  44. 0  system/database/drivers/odbc/odbc_result.php
  45. 0  system/database/drivers/odbc/odbc_utility.php
  46. 0  system/database/drivers/pdo/index.html
  47. 0  system/database/drivers/pdo/pdo_driver.php
  48. 0  system/database/drivers/pdo/pdo_forge.php
  49. 0  system/database/drivers/pdo/pdo_result.php
  50. 0  system/database/drivers/pdo/pdo_utility.php
  51. 0  system/database/drivers/postgre/index.html
  52. 0  system/database/drivers/postgre/postgre_driver.php
  53. 0  system/database/drivers/postgre/postgre_forge.php
  54. 0  system/database/drivers/postgre/postgre_result.php
  55. 0  system/database/drivers/postgre/postgre_utility.php
  56. 0  system/database/drivers/sqlite/index.html
  57. 0  system/database/drivers/sqlite/sqlite_driver.php
  58. 0  system/database/drivers/sqlite/sqlite_forge.php
  59. 0  system/database/drivers/sqlite/sqlite_result.php
  60. 0  system/database/drivers/sqlite/sqlite_utility.php
  61. 0  system/database/drivers/sqlsrv/index.html
  62. 0  system/database/drivers/sqlsrv/sqlsrv_driver.php
  63. 0  system/database/drivers/sqlsrv/sqlsrv_forge.php
  64. 0  system/database/drivers/sqlsrv/sqlsrv_result.php
  65. 0  system/database/drivers/sqlsrv/sqlsrv_utility.php
  66. 0  system/database/index.html
  67. 0  system/fonts/index.html
  68. 0  system/fonts/texb.ttf
  69. 0  system/helpers/array_helper.php
  70. 0  system/helpers/captcha_helper.php
  71. 0  system/helpers/cookie_helper.php
  72. 0  system/helpers/date_helper.php
  73. 0  system/helpers/directory_helper.php
  74. 0  system/helpers/download_helper.php
  75. 0  system/helpers/email_helper.php
  76. 0  system/helpers/file_helper.php
  77. 0  system/helpers/form_helper.php
  78. 0  system/helpers/html_helper.php
  79. 0  system/helpers/index.html
  80. 0  system/helpers/inflector_helper.php
  81. 0  system/helpers/language_helper.php
  82. 0  system/helpers/number_helper.php
  83. 0  system/helpers/path_helper.php
  84. 0  system/helpers/security_helper.php
  85. 0  system/helpers/smiley_helper.php
  86. 0  system/helpers/string_helper.php
  87. 0  system/helpers/text_helper.php
  88. 0  system/helpers/typography_helper.php
  89. 0  system/helpers/url_helper.php
  90. 0  system/helpers/xml_helper.php
  91. 0  system/index.html
  92. 0  system/language/english/calendar_lang.php
  93. 0  system/language/english/date_lang.php
  94. 0  system/language/english/db_lang.php
  95. 0  system/language/english/email_lang.php
  96. 0  system/language/english/form_validation_lang.php
  97. 0  system/language/english/ftp_lang.php
  98. 0  system/language/english/imglib_lang.php
  99. 0  system/language/english/index.html
  100. 0  system/language/english/migration_lang.php
  101. 0  system/language/english/number_lang.php
  102. 0  system/language/english/profiler_lang.php
  103. 0  system/language/english/unit_test_lang.php
  104. 0  system/language/english/upload_lang.php
  105. 0  system/language/index.html
  106. 0  system/libraries/Cache/Cache.php
  107. 0  system/libraries/Cache/drivers/Cache_apc.php
  108. 0  system/libraries/Cache/drivers/Cache_dummy.php
  109. 0  system/libraries/Cache/drivers/Cache_file.php
  110. 0  system/libraries/Cache/drivers/Cache_memcached.php
  111. 0  system/libraries/Calendar.php
  112. 0  system/libraries/Cart.php
  113. 0  system/libraries/Driver.php
  114. +1 −1  system/libraries/Email.php
  115. 0  system/libraries/Encrypt.php
  116. 0  system/libraries/Form_validation.php
  117. 0  system/libraries/Ftp.php
  118. 0  system/libraries/Image_lib.php
  119. 0  system/libraries/Javascript.php
  120. 0  system/libraries/Log.php
  121. +1 −1  system/libraries/Migration.php
  122. 0  system/libraries/Pagination.php
  123. 0  system/libraries/Parser.php
  124. 0  system/libraries/Profiler.php
  125. 0  system/libraries/Session.php
  126. 0  system/libraries/Sha1.php
  127. 0  system/libraries/Table.php
  128. 0  system/libraries/Trackback.php
  129. 0  system/libraries/Typography.php
  130. 0  system/libraries/Unit_test.php
  131. 0  system/libraries/Upload.php
  132. 0  system/libraries/User_agent.php
  133. 0  system/libraries/Xmlrpc.php
  134. 0  system/libraries/Xmlrpcs.php
  135. 0  system/libraries/Zip.php
  136. 0  system/libraries/index.html
  137. 0  system/libraries/javascript/Jquery.php
View
0  index.php 100644 → 100755
File mode changed
View
2  system/core/CodeIgniter.php
@@ -33,7 +33,7 @@
* @var string
*
*/
- define('CI_VERSION', '2.1.3');
+ define('CI_VERSION', '2.1.4');
/**
* CodeIgniter Branch (Core = TRUE, Reactor = FALSE)
View
0  system/core/Common.php 100644 → 100755
File mode changed
View
0  system/core/Controller.php 100644 → 100755
File mode changed
View
0  system/core/Loader.php 100644 → 100755
File mode changed
View
13 system/core/Security.php
@@ -619,17 +619,16 @@ protected function _remove_evil_attributes($str, $is_image)
$count = 0;
$attribs = array();
- // find occurrences of illegal attribute strings without quotes
- preg_match_all('/('.implode('|', $evil_attributes).')\s*=\s*([^\s>]*)/is', $str, $matches, PREG_SET_ORDER);
+ // find occurrences of illegal attribute strings with quotes (042 and 047 are octal quotes)
+ preg_match_all('/('.implode('|', $evil_attributes).')\s*=\s*(\042|\047)([^\\2]*?)(\\2)/is', $str, $matches, PREG_SET_ORDER);
foreach ($matches as $attr)
{
-
$attribs[] = preg_quote($attr[0], '/');
}
- // find occurrences of illegal attribute strings with quotes (042 and 047 are octal quotes)
- preg_match_all("/(".implode('|', $evil_attributes).")\s*=\s*(\042|\047)([^\\2]*?)(\\2)/is", $str, $matches, PREG_SET_ORDER);
+ // find occurrences of illegal attribute strings without quotes
+ preg_match_all('/('.implode('|', $evil_attributes).')\s*=\s*([^\s>]*)/is', $str, $matches, PREG_SET_ORDER);
foreach ($matches as $attr)
{
@@ -639,7 +638,7 @@ protected function _remove_evil_attributes($str, $is_image)
// replace illegal attribute strings that are inside an html tag
if (count($attribs) > 0)
{
- $str = preg_replace("/<(\/?[^><]+?)([^A-Za-z<>\-])(.*?)(".implode('|', $attribs).")(.*?)([\s><])([><]*)/i", '<$1 $3$5$6$7', $str, -1, $count);
+ $str = preg_replace('/(<?)(\/?[^><]+?)([^A-Za-z<>\-])(.*?)('.implode('|', $attribs).')(.*?)([\s><]?)([><]*)/i', '$1$2 $4$6$7$8', $str, -1, $count);
}
} while ($count);
@@ -873,4 +872,4 @@ protected function _csrf_set_hash()
}
/* End of file Security.php */
-/* Location: ./system/libraries/Security.php */
+/* Location: ./system/libraries/Security.php */
View
0  system/core/Utf8.php 100644 → 100755
File mode changed
View
0  system/core/index.html 100644 → 100755
File mode changed
View
2  system/database/DB_active_rec.php 100644 → 100755
@@ -1404,7 +1404,7 @@ public function set_update_batch($key, $index = '', $escape = TRUE)
}
else
{
- $not[] = $k.'-'.$v;
+ $not[] = $k2.'-'.$v2;
}
if ($escape === FALSE)
View
0  system/database/DB_cache.php 100644 → 100755
File mode changed
View
0  system/database/DB_driver.php 100644 → 100755
File mode changed
View
0  system/database/DB_forge.php 100644 → 100755
File mode changed
View
0  system/database/DB_result.php 100644 → 100755
File mode changed
View
0  system/database/DB_utility.php 100644 → 100755
File mode changed
View
0  system/database/drivers/cubrid/cubrid_driver.php 100644 → 100755
File mode changed
View
0  system/database/drivers/cubrid/cubrid_forge.php 100644 → 100755
File mode changed
View
0  system/database/drivers/cubrid/cubrid_result.php 100644 → 100755
File mode changed
View
0  system/database/drivers/cubrid/cubrid_utility.php 100644 → 100755
File mode changed
View
0  system/database/drivers/cubrid/index.html 100644 → 100755
File mode changed
View
0  system/database/drivers/index.html 100644 → 100755
File mode changed
View
0  system/database/drivers/mssql/index.html 100644 → 100755
File mode changed
View
0  system/database/drivers/mssql/mssql_driver.php 100644 → 100755
File mode changed
View
0  system/database/drivers/mssql/mssql_forge.php 100644 → 100755
File mode changed
View
0  system/database/drivers/mssql/mssql_result.php 100644 → 100755
File mode changed
View
0  system/database/drivers/mssql/mssql_utility.php 100644 → 100755
File mode changed
View
0  system/database/drivers/mysql/index.html 100644 → 100755
File mode changed
View
0  system/database/drivers/mysql/mysql_driver.php 100644 → 100755
File mode changed
View
0  system/database/drivers/mysql/mysql_forge.php 100644 → 100755
File mode changed
View
0  system/database/drivers/mysql/mysql_result.php 100644 → 100755
File mode changed
View
0  system/database/drivers/mysql/mysql_utility.php 100644 → 100755
File mode changed
View
0  system/database/drivers/mysqli/index.html 100644 → 100755
File mode changed
View
0  system/database/drivers/mysqli/mysqli_driver.php 100644 → 100755
File mode changed
View
0  system/database/drivers/mysqli/mysqli_forge.php 100644 → 100755
File mode changed
View
0  system/database/drivers/mysqli/mysqli_result.php 100644 → 100755
File mode changed
View
0  system/database/drivers/mysqli/mysqli_utility.php 100644 → 100755
File mode changed
View
0  system/database/drivers/oci8/index.html 100644 → 100755
File mode changed
View
0  system/database/drivers/oci8/oci8_driver.php 100644 → 100755
File mode changed
View
0  system/database/drivers/oci8/oci8_forge.php 100644 → 100755
File mode changed
View
0  system/database/drivers/oci8/oci8_result.php 100644 → 100755
File mode changed
View
0  system/database/drivers/oci8/oci8_utility.php 100644 → 100755
File mode changed
View
0  system/database/drivers/odbc/index.html 100644 → 100755
File mode changed
View
0  system/database/drivers/odbc/odbc_driver.php 100644 → 100755
File mode changed
View
0  system/database/drivers/odbc/odbc_forge.php 100644 → 100755
File mode changed
View
0  system/database/drivers/odbc/odbc_result.php 100644 → 100755
File mode changed
View
0  system/database/drivers/odbc/odbc_utility.php 100644 → 100755
File mode changed
View
0  system/database/drivers/pdo/index.html 100644 → 100755
File mode changed
View
0  system/database/drivers/pdo/pdo_driver.php 100644 → 100755
File mode changed
View
0  system/database/drivers/pdo/pdo_forge.php 100644 → 100755
File mode changed
View
0  system/database/drivers/pdo/pdo_result.php 100644 → 100755
File mode changed
View
0  system/database/drivers/pdo/pdo_utility.php 100644 → 100755
File mode changed
View
0  system/database/drivers/postgre/index.html 100644 → 100755
File mode changed
View
0  system/database/drivers/postgre/postgre_driver.php 100644 → 100755
File mode changed
View
0  system/database/drivers/postgre/postgre_forge.php 100644 → 100755
File mode changed
View
0  system/database/drivers/postgre/postgre_result.php 100644 → 100755
File mode changed
View
0  system/database/drivers/postgre/postgre_utility.php 100644 → 100755
File mode changed
View
0  system/database/drivers/sqlite/index.html 100644 → 100755
File mode changed
View
0  system/database/drivers/sqlite/sqlite_driver.php 100644 → 100755
File mode changed
View
0  system/database/drivers/sqlite/sqlite_forge.php 100644 → 100755
File mode changed
View
0  system/database/drivers/sqlite/sqlite_result.php 100644 → 100755
File mode changed
View
0  system/database/drivers/sqlite/sqlite_utility.php 100644 → 100755
File mode changed
View
0  system/database/drivers/sqlsrv/index.html 100644 → 100755
File mode changed
View
0  system/database/drivers/sqlsrv/sqlsrv_driver.php 100644 → 100755
File mode changed
View
0  system/database/drivers/sqlsrv/sqlsrv_forge.php 100644 → 100755
File mode changed
View
0  system/database/drivers/sqlsrv/sqlsrv_result.php 100644 → 100755
File mode changed
View
0  system/database/drivers/sqlsrv/sqlsrv_utility.php 100644 → 100755
File mode changed
View
0  system/database/index.html 100644 → 100755
File mode changed
View
0  system/fonts/index.html 100644 → 100755
File mode changed
View
0  system/fonts/texb.ttf 100644 → 100755
File mode changed
View
0  system/helpers/array_helper.php 100644 → 100755
File mode changed
View
0  system/helpers/captcha_helper.php 100644 → 100755
File mode changed
View
0  system/helpers/cookie_helper.php 100644 → 100755
File mode changed
View
0  system/helpers/date_helper.php 100644 → 100755
File mode changed
View
0  system/helpers/directory_helper.php 100644 → 100755
File mode changed
View
0  system/helpers/download_helper.php 100644 → 100755
File mode changed
View
0  system/helpers/email_helper.php 100644 → 100755
File mode changed
View
0  system/helpers/file_helper.php 100644 → 100755
File mode changed
View
0  system/helpers/form_helper.php 100644 → 100755
File mode changed
View
0  system/helpers/html_helper.php 100644 → 100755
File mode changed
View
0  system/helpers/index.html 100644 → 100755
File mode changed
View
0  system/helpers/inflector_helper.php 100644 → 100755
File mode changed
View
0  system/helpers/language_helper.php 100644 → 100755
File mode changed
View
0  system/helpers/number_helper.php 100644 → 100755
File mode changed
View
0  system/helpers/path_helper.php 100644 → 100755
File mode changed
View
0  system/helpers/security_helper.php 100644 → 100755
File mode changed
View
0  system/helpers/smiley_helper.php 100644 → 100755
File mode changed
View
0  system/helpers/string_helper.php 100644 → 100755
File mode changed
View
0  system/helpers/text_helper.php 100644 → 100755
File mode changed
View
0  system/helpers/typography_helper.php 100644 → 100755
File mode changed
View
0  system/helpers/url_helper.php 100644 → 100755
File mode changed
View
0  system/helpers/xml_helper.php 100644 → 100755
File mode changed
View
0  system/index.html 100644 → 100755
File mode changed
View
0  system/language/english/calendar_lang.php 100644 → 100755
File mode changed
View
0  system/language/english/date_lang.php 100644 → 100755
File mode changed
View
0  system/language/english/db_lang.php 100644 → 100755
File mode changed
View
0  system/language/english/email_lang.php 100644 → 100755
File mode changed
View
0  system/language/english/form_validation_lang.php 100644 → 100755
File mode changed
View
0  system/language/english/ftp_lang.php 100644 → 100755
File mode changed
View
0  system/language/english/imglib_lang.php 100644 → 100755
File mode changed
View
0  system/language/english/index.html 100644 → 100755
File mode changed
View
0  system/language/english/migration_lang.php 100644 → 100755
File mode changed
View
0  system/language/english/number_lang.php 100644 → 100755
File mode changed
View
0  system/language/english/profiler_lang.php 100644 → 100755
File mode changed
View
0  system/language/english/unit_test_lang.php 100644 → 100755
File mode changed
View
0  system/language/english/upload_lang.php 100644 → 100755
File mode changed
View
0  system/language/index.html 100644 → 100755
File mode changed
View
0  system/libraries/Cache/Cache.php 100644 → 100755
File mode changed
View
0  system/libraries/Cache/drivers/Cache_apc.php 100644 → 100755
File mode changed
View
0  system/libraries/Cache/drivers/Cache_dummy.php 100644 → 100755
File mode changed
View
0  system/libraries/Cache/drivers/Cache_file.php 100644 → 100755
File mode changed
View
0  system/libraries/Cache/drivers/Cache_memcached.php 100644 → 100755
File mode changed
View
0  system/libraries/Calendar.php 100644 → 100755
File mode changed
View
0  system/libraries/Cart.php 100644 → 100755
File mode changed
View
0  system/libraries/Driver.php 100644 → 100755
File mode changed
View
2  system/libraries/Email.php 100644 → 100755
@@ -1954,7 +1954,7 @@ public function print_debugger()
}
}
- $msg .= "<pre>".$this->_header_str."\n".htmlspecialchars($this->_subject)."\n".htmlspecialchars($this->_finalbody).'</pre>';
+ $msg .= "<pre>".htmlspecialchars($this->_header_str)."\n".htmlspecialchars($this->_subject)."\n".htmlspecialchars($this->_finalbody).'</pre>';
return $msg;
}
View
0  system/libraries/Encrypt.php 100644 → 100755
File mode changed
View
0  system/libraries/Form_validation.php 100644 → 100755
File mode changed
View
0  system/libraries/Ftp.php 100644 → 100755
File mode changed
View
0  system/libraries/Image_lib.php 100644 → 100755
File mode changed
View
0  system/libraries/Javascript.php 100644 → 100755
File mode changed
View
0  system/libraries/Log.php 100644 → 100755
File mode changed
View
2  system/libraries/Migration.php 100644 → 100755
@@ -220,7 +220,7 @@ public function latest()
{
if ( ! $migrations = $this->find_migrations())
{
- $this->_error_string = $this->line->lang('migration_none_found');
+ $this->_error_string = $this->lang->line('migration_none_found');
return false;
}
View
0  system/libraries/Pagination.php 100644 → 100755
File mode changed
View
0  system/libraries/Parser.php 100644 → 100755
File mode changed
View
0  system/libraries/Profiler.php 100644 → 100755
File mode changed
View
0  system/libraries/Session.php 100644 → 100755
File mode changed
View
0  system/libraries/Sha1.php 100644 → 100755
File mode changed
View
0  system/libraries/Table.php 100644 → 100755
File mode changed
View
0  system/libraries/Trackback.php 100644 → 100755
File mode changed
View
0  system/libraries/Typography.php 100644 → 100755
File mode changed
View
0  system/libraries/Unit_test.php 100644 → 100755
File mode changed
View
0  system/libraries/Upload.php 100644 → 100755
File mode changed
View
0  system/libraries/User_agent.php 100644 → 100755
File mode changed
View
0  system/libraries/Xmlrpc.php 100644 → 100755
File mode changed
View
0  system/libraries/Xmlrpcs.php 100644 → 100755
File mode changed
View
0  system/libraries/Zip.php 100644 → 100755
File mode changed
View
0  system/libraries/index.html 100644 → 100755
File mode changed
View
0  system/libraries/javascript/Jquery.php 100644 → 100755
File mode changed
Please sign in to comment.
Something went wrong with that request. Please try again.