Permalink
Browse files

Merge branch 'develop' of https://github.com/EllisLab/CodeIgniter int…

…o develop-644
  • Loading branch information...
garthkerr committed Apr 27, 2012
2 parents 0c08246 + 61318a2 commit 45429a7ccb55075cc7edebc74d417e649863651f
Showing with 18,306 additions and 15,138 deletions.
  1. +28 −0 .travis.yml
  2. +5 −5 application/config/autoload.php
  3. +12 −5 application/config/config.php
  4. +7 −7 application/config/constants.php
  5. +33 −27 application/config/database.php
  6. +24 −14 application/config/doctypes.php
  7. +39 −34 application/config/foreign_chars.php
  8. +5 −6 application/config/hooks.php
  9. +46 −0 application/config/memcached.php
  10. +8 −12 application/config/migration.php
  11. +16 −13 application/config/mimes.php
  12. +5 −6 application/config/profiler.php
  13. +5 −6 application/config/routes.php
  14. +5 −5 application/config/smileys.php
  15. +163 −158 application/config/user_agents.php
  16. +7 −7 application/controllers/welcome.php
  17. +6 −8 application/errors/error_404.php
  18. +6 −8 application/errors/error_db.php
  19. +6 −8 application/errors/error_general.php
  20. +9 −9 application/errors/error_php.php
  21. +8 −10 application/views/welcome_message.php
  22. +27 −36 index.php
  23. +0 −245 license.rst
  24. +20 −20 readme.rst
  25. +14 −22 system/core/Benchmark.php
  26. +38 −37 system/core/CodeIgniter.php
  27. +201 −201 system/core/Common.php
  28. +47 −80 system/core/Config.php
  29. +18 −13 system/core/Controller.php
  30. +33 −51 system/core/Exceptions.php
  31. +24 −43 system/core/Hooks.php
  32. +195 −222 system/core/Input.php
  33. +15 −21 system/core/Lang.php
  34. +124 −118 system/core/Loader.php
  35. +9 −15 system/core/Model.php
  36. +91 −126 system/core/Output.php
  37. +62 −89 system/core/Router.php
  38. +175 −211 system/core/Security.php
  39. +103 −115 system/core/URI.php
  40. +21 −36 system/core/Utf8.php
  41. +41 −53 system/database/DB.php
  42. +16 −37 system/database/DB_cache.php
  43. +400 −410 system/database/DB_driver.php
  44. +84 −88 system/database/DB_forge.php
  45. +590 −496 system/database/{DB_active_rec.php → DB_query_builder.php}
  46. +44 −72 system/database/DB_result.php
  47. +115 −154 system/database/DB_utility.php
  48. +129 −413 system/database/drivers/cubrid/cubrid_driver.php
  49. +50 −148 system/database/drivers/cubrid/cubrid_forge.php
  50. +31 −75 system/database/drivers/cubrid/cubrid_result.php
  51. +11 −61 system/database/drivers/cubrid/cubrid_utility.php
  52. +10 −0 system/database/drivers/interbase/index.html
  53. +486 −0 system/database/drivers/interbase/interbase_driver.php
  54. +224 −0 system/database/drivers/interbase/interbase_forge.php
  55. +260 −0 system/database/drivers/interbase/interbase_result.php
  56. +62 −0 system/database/drivers/interbase/interbase_utility.php
  57. +107 −249 system/database/drivers/mssql/mssql_driver.php
  58. +20 −82 system/database/drivers/mssql/mssql_forge.php
  59. +18 −28 system/database/drivers/mssql/mssql_result.php
  60. +8 −53 system/database/drivers/mssql/mssql_utility.php
  61. +129 −375 system/database/drivers/mysql/mysql_driver.php
  62. +38 −136 system/database/drivers/mysql/mysql_forge.php
  63. +25 −42 system/database/drivers/mysql/mysql_result.php
  64. +25 −77 system/database/drivers/mysql/mysql_utility.php
  65. +138 −358 system/database/drivers/mysqli/mysqli_driver.php
  66. +51 −133 system/database/drivers/mysqli/mysqli_forge.php
  67. +34 −50 system/database/drivers/mysqli/mysqli_result.php
  68. +9 −53 system/database/drivers/mysqli/mysqli_utility.php
  69. +203 −339 system/database/drivers/oci8/oci8_driver.php
  70. +34 −141 system/database/drivers/oci8/oci8_forge.php
  71. +523 −54 system/database/drivers/oci8/oci8_result.php
  72. +8 −53 system/database/drivers/oci8/oci8_utility.php
  73. +61 −294 system/database/drivers/odbc/odbc_driver.php
  74. +20 −99 system/database/drivers/odbc/odbc_forge.php
  75. +131 −65 system/database/drivers/odbc/odbc_result.php
  76. +7 −68 system/database/drivers/odbc/odbc_utility.php
  77. +273 −402 system/database/drivers/pdo/pdo_driver.php
  78. +26 −100 system/database/drivers/pdo/pdo_forge.php
  79. +123 −48 system/database/drivers/pdo/pdo_result.php
  80. +7 −68 system/database/drivers/pdo/pdo_utility.php
  81. +179 −320 system/database/drivers/postgre/postgre_driver.php
  82. +75 −163 system/database/drivers/postgre/postgre_forge.php
  83. +26 −38 system/database/drivers/postgre/postgre_result.php
  84. +8 −54 system/database/drivers/postgre/postgre_utility.php
  85. +63 −269 system/database/drivers/sqlite/sqlite_driver.php
  86. +25 −69 system/database/drivers/sqlite/sqlite_forge.php
  87. +28 −60 system/database/drivers/sqlite/sqlite_result.php
  88. +8 −62 system/database/drivers/sqlite/sqlite_utility.php
  89. +10 −0 system/database/drivers/sqlite3/index.html
  90. +431 −0 system/database/drivers/sqlite3/sqlite3_driver.php
  91. +195 −0 system/database/drivers/sqlite3/sqlite3_forge.php
  92. +615 −0 system/database/drivers/sqlite3/sqlite3_result.php
  93. +54 −0 system/database/drivers/sqlite3/sqlite3_utility.php
  94. +157 −244 system/database/drivers/sqlsrv/sqlsrv_driver.php
  95. +21 −83 system/database/drivers/sqlsrv/sqlsrv_forge.php
  96. +22 −48 system/database/drivers/sqlsrv/sqlsrv_result.php
  97. +11 −56 system/database/drivers/sqlsrv/sqlsrv_utility.php
  98. +12 −37 system/helpers/array_helper.php
  99. +51 −103 system/helpers/captcha_helper.php
  100. +12 −22 system/helpers/cookie_helper.php
  101. +91 −99 system/helpers/date_helper.php
  102. +8 −12 system/helpers/directory_helper.php
  103. +53 −42 system/helpers/download_helper.php
  104. +10 −11 system/helpers/email_helper.php
  105. +44 −61 system/helpers/file_helper.php
  106. +79 −132 system/helpers/form_helper.php
  107. +44 −82 system/helpers/html_helper.php
  108. +44 −25 system/helpers/inflector_helper.php
  109. +6 −10 system/helpers/language_helper.php
  110. +5 −9 system/helpers/number_helper.php
  111. +13 −24 system/helpers/path_helper.php
  112. +10 −23 system/helpers/security_helper.php
  113. +9 −17 system/helpers/smiley_helper.php
  114. +23 −32 system/helpers/string_helper.php
  115. +19 −40 system/helpers/text_helper.php
  116. +6 −12 system/helpers/typography_helper.php
  117. +94 −115 system/helpers/url_helper.php
  118. +15 −19 system/helpers/xml_helper.php
  119. +2 −2 system/language/english/calendar_lang.php
  120. +6 −6 system/language/english/date_lang.php
  121. +2 −2 system/language/english/db_lang.php
  122. +2 −2 system/language/english/email_lang.php
  123. +28 −26 system/language/english/form_validation_lang.php
  124. +2 −2 system/language/english/ftp_lang.php
  125. +2 −2 system/language/english/imglib_lang.php
  126. +2 −2 system/language/english/migration_lang.php
  127. +2 −2 system/language/english/number_lang.php
  128. +2 −2 system/language/english/profiler_lang.php
  129. +2 −2 system/language/english/unit_test_lang.php
  130. +3 −3 system/language/english/upload_lang.php
  131. +64 −82 system/libraries/Cache/Cache.php
  132. +33 −37 system/libraries/Cache/drivers/Cache_apc.php
  133. +19 −26 system/libraries/Cache/drivers/Cache_dummy.php
  134. +40 −59 system/libraries/Cache/drivers/Cache_file.php
  135. +33 −40 system/libraries/Cache/drivers/Cache_memcached.php
  136. +162 −0 system/libraries/Cache/drivers/Cache_wincache.php
  137. +89 −109 system/libraries/Calendar.php
  138. +86 −135 system/libraries/Cart.php
  139. +30 −39 system/libraries/Driver.php
  140. +290 −481 system/libraries/Email.php
  141. +73 −161 system/libraries/Encrypt.php
  142. +258 −329 system/libraries/Form_validation.php
  143. +74 −119 system/libraries/Ftp.php
  144. +363 −447 system/libraries/Image_lib.php
  145. +72 −127 system/libraries/Javascript.php
  146. +18 −21 system/libraries/Log.php
  147. +33 −49 system/libraries/Migration.php
  148. +78 −101 system/libraries/Pagination.php
  149. +33 −46 system/libraries/Parser.php
  150. +132 −191 system/libraries/Profiler.php
  151. +172 −158 system/libraries/Session.php
  152. +0 −263 system/libraries/Sha1.php
  153. +103 −134 system/libraries/Table.php
  154. +76 −136 system/libraries/Trackback.php
  155. +60 −90 system/libraries/Typography.php
  156. +47 −81 system/libraries/Unit_test.php
  157. +238 −225 system/libraries/Upload.php
  158. +61 −94 system/libraries/User_agent.php
  159. +639 −531 system/libraries/Xmlrpc.php
  160. +85 −117 system/libraries/Xmlrpcs.php
  161. +75 −95 system/libraries/Zip.php
  162. +170 −242 system/libraries/javascript/Jquery.php
  163. +21 −0 tests/Bootstrap.php
  164. +164 −0 tests/README.md
  165. +13 −0 tests/codeigniter/Setup_test.php
  166. +13 −0 tests/codeigniter/core/Common_test.php
  167. +93 −0 tests/codeigniter/core/Config_test.php
  168. +31 −0 tests/codeigniter/core/Lang_test.php
  169. +235 −0 tests/codeigniter/core/Loader_test.php
  170. +313 −0 tests/codeigniter/core/URI_test.php
  171. +36 −0 tests/codeigniter/database/DB_driver_test.php
  172. +49 −0 tests/codeigniter/database/DB_test.php
  173. +53 −0 tests/codeigniter/database/query_builder/get_test.php
  174. +67 −0 tests/codeigniter/database/query_builder/insert_test.php
  175. +95 −0 tests/codeigniter/database/query_builder/select_test.php
  176. +47 −0 tests/codeigniter/helpers/array_helper_test.php
  177. +288 −0 tests/codeigniter/helpers/date_helper_test.php
  178. +41 −0 tests/codeigniter/helpers/directory_helper_test.php
  179. +18 −0 tests/codeigniter/helpers/email_helper_test.php
  180. +156 −0 tests/codeigniter/helpers/file_helper_test.php
  181. +252 −0 tests/codeigniter/helpers/form_helper_test.php
  182. +80 −0 tests/codeigniter/helpers/html_helper_test.php
  183. +95 −0 tests/codeigniter/helpers/inflector_helper_test.php
  184. +77 −0 tests/codeigniter/helpers/number_helper_test.php
  185. +32 −0 tests/codeigniter/helpers/path_helper_test.php
  186. +147 −0 tests/codeigniter/helpers/string_helper_test.php
  187. +159 −0 tests/codeigniter/helpers/text_helper_test.php
  188. +75 −0 tests/codeigniter/helpers/url_helper_test.php
  189. +15 −0 tests/codeigniter/helpers/xml_helper_test.php
  190. +110 −0 tests/codeigniter/libraries/Parser_test.php
  191. +296 −0 tests/codeigniter/libraries/Table_test.php
  192. +188 −0 tests/codeigniter/libraries/Typography_test.php
  193. +87 −0 tests/codeigniter/libraries/Useragent_test.php
  194. +90 −0 tests/mocks/autoloader.php
  195. +196 −0 tests/mocks/ci_testcase.php
  196. +132 −0 tests/mocks/core/common.php
  197. +30 −0 tests/mocks/core/loader.php
  198. +25 −0 tests/mocks/core/uri.php
  199. BIN tests/mocks/database/ci_test.sqlite
  200. +34 −0 tests/mocks/database/config/mysql.php
  201. +37 −0 tests/mocks/database/config/pdo/mysql.php
  202. +37 −0 tests/mocks/database/config/pdo/pgsql.php
  203. +37 −0 tests/mocks/database/config/pdo/sqlite.php
  204. +34 −0 tests/mocks/database/config/pgsql.php
  205. +34 −0 tests/mocks/database/config/sqlite.php
  206. +100 −0 tests/mocks/database/db.php
  207. +36 −0 tests/mocks/database/db/driver.php
  208. +10 −0 tests/mocks/database/db/querybuilder.php
  209. +16 −0 tests/mocks/database/drivers/mysql.php
  210. +16 −0 tests/mocks/database/drivers/pdo.php
  211. +16 −0 tests/mocks/database/drivers/postgre.php
  212. +16 −0 tests/mocks/database/drivers/sqlite.php
  213. +98 −0 tests/mocks/database/schema/skeleton.php
  214. +3 −0 tests/mocks/libraries/parser.php
  215. +15 −0 tests/mocks/libraries/table.php
  216. +3 −0 tests/mocks/libraries/typography.php
  217. +3 −0 tests/mocks/libraries/useragent.php
  218. +32 −0 tests/travis/mysql.phpunit.xml
  219. +32 −0 tests/travis/pdo/mysql.phpunit.xml
  220. +32 −0 tests/travis/pdo/pgsql.phpunit.xml
  221. +32 −0 tests/travis/pdo/sqlite.phpunit.xml
  222. +32 −0 tests/travis/pgsql.phpunit.xml
  223. +32 −0 tests/travis/sqlite.phpunit.xml
  224. +2 −2 user_guide_src/cilexer/cilexer/cilexer.py
  225. +2 −2 user_guide_src/source/_themes/eldocs/static/asset/css/common.css
  226. +231 −23 user_guide_src/source/changelog.rst
  227. +3 −3 user_guide_src/source/conf.py
  228. +59 −12 user_guide_src/source/database/configuration.rst
  229. +26 −5 user_guide_src/source/database/connecting.rst
  230. +4 −4 user_guide_src/source/database/examples.rst
  231. +3 −3 user_guide_src/source/database/helpers.rst
  232. +2 −2 user_guide_src/source/database/index.rst
  233. +18 −1 user_guide_src/source/database/queries.rst
  234. +131 −86 user_guide_src/source/database/{active_record.rst → query_builder.rst}
  235. +7 −2 user_guide_src/source/database/results.rst
  236. +6 −2 user_guide_src/source/database/utilities.rst
  237. +11 −5 user_guide_src/source/general/creating_libraries.rst
  238. +1 −1 user_guide_src/source/general/models.rst
  239. +3 −3 user_guide_src/source/general/requirements.rst
  240. +29 −3 user_guide_src/source/general/styleguide.rst
  241. +12 −8 user_guide_src/source/general/urls.rst
  242. +11 −11 user_guide_src/source/general/views.rst
  243. +100 −65 user_guide_src/source/helpers/date_helper.rst
  244. +1 −1 user_guide_src/source/helpers/directory_helper.rst
  245. +154 −115 user_guide_src/source/helpers/form_helper.rst
  246. +41 −21 user_guide_src/source/helpers/html_helper.rst
  247. +6 −0 user_guide_src/source/helpers/inflector_helper.rst
  248. +13 −7 user_guide_src/source/helpers/path_helper.rst
  249. +4 −3 user_guide_src/source/helpers/security_helper.rst
  250. +31 −1 user_guide_src/source/helpers/string_helper.rst
  251. +5 −0 user_guide_src/source/helpers/text_helper.rst
  252. +11 −10 user_guide_src/source/helpers/url_helper.rst
  253. +1 −1 user_guide_src/source/installation/upgrade_200.rst
  254. +43 −0 user_guide_src/source/installation/upgrade_300.rst
  255. +14 −6 user_guide_src/source/libraries/cart.rst
  256. +15 −1 user_guide_src/source/libraries/email.rst
  257. +0 −15 user_guide_src/source/libraries/encryption.rst
  258. +8 −8 user_guide_src/source/libraries/file_uploading.rst
  259. +97 −35 user_guide_src/source/libraries/form_validation.rst
  260. +5 −7 user_guide_src/source/libraries/image_lib.rst
  261. +13 −3 user_guide_src/source/libraries/input.rst
  262. +2 −2 user_guide_src/source/libraries/javascript.rst
  263. +6 −0 user_guide_src/source/libraries/loader.rst
  264. +5 −0 user_guide_src/source/libraries/migration.rst
  265. +9 −0 user_guide_src/source/libraries/output.rst
  266. +4 −0 user_guide_src/source/libraries/security.rst
  267. +4 −0 user_guide_src/source/libraries/sessions.rst
  268. +2 −0 user_guide_src/source/libraries/table.rst
  269. +15 −13 user_guide_src/source/libraries/xmlrpc.rst
  270. +1 −1 user_guide_src/source/overview/at_a_glance.rst
  271. +1 −1 user_guide_src/source/overview/features.rst
  272. +2 −2 user_guide_src/source/tutorial/create_news_items.rst
  273. +1 −1 user_guide_src/source/tutorial/index.rst
  274. +3 −3 user_guide_src/source/tutorial/news_section.rst
  275. +4 −4 user_guide_src/source/tutorial/static_pages.rst
View
@@ -0,0 +1,28 @@
+language: php
+
+php:
+ - 5.3
+ - 5.4
+
+env:
+ - DB=mysql
+ - DB=pgsql
+ - DB=sqlite
+ - DB=pdo/mysql
+ - DB=pdo/pgsql
+ - DB=pdo/sqlite
+
+before_script:
+ - pyrus channel-discover pear.php-tools.net
+ - pyrus install http://pear.php-tools.net/get/vfsStream-0.11.2.tgz
+ - phpenv rehash
+ - sh -c "if [ '$DB' = 'pgsql' ] || [ '$DB' = 'pdo/pgsql' ]; then psql -c 'DROP DATABASE IF EXISTS ci_test;' -U postgres; fi"
+ - sh -c "if [ '$DB' = 'pgsql' ] || [ '$DB' = 'pdo/pgsql' ]; then psql -c 'create database ci_test;' -U postgres; fi"
+ - sh -c "if [ '$DB' = 'mysql' ] || [ '$DB' = 'pdo/mysql' ]; then mysql -e 'create database IF NOT EXISTS ci_test;'; fi"
+
+script: phpunit --configuration tests/travis/$DB.phpunit.xml
+
+branches:
+ only:
+ - develop
+ - master
@@ -1,13 +1,13 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
/**
* CodeIgniter
*
- * An open source application development framework for PHP 5.1.6 or newer
+ * An open source application development framework for PHP 5.2.4 or newer
*
* NOTICE OF LICENSE
- *
+ *
* Licensed under the Academic Free License version 3.0
- *
+ *
* This source file is subject to the Academic Free License (AFL 3.0) that is
* bundled with this package in the files license_afl.txt / license_afl.rst.
* It is also available through the world wide web at this URL:
@@ -18,7 +18,7 @@
*
* @package CodeIgniter
* @author EllisLab Dev Team
- * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc. (http://ellislab.com/)
+ * @copyright Copyright (c) 2008 - 2012, EllisLab, Inc. (http://ellislab.com/)
* @license http://opensource.org/licenses/AFL-3.0 Academic Free License (AFL 3.0)
* @link http://codeigniter.com
* @since Version 1.0
@@ -1,13 +1,13 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
/**
* CodeIgniter
*
- * An open source application development framework for PHP 5.1.6 or newer
+ * An open source application development framework for PHP 5.2.4 or newer
*
* NOTICE OF LICENSE
- *
+ *
* Licensed under the Academic Free License version 3.0
- *
+ *
* This source file is subject to the Academic Free License (AFL 3.0) that is
* bundled with this package in the files license_afl.txt / license_afl.rst.
* It is also available through the world wide web at this URL:
@@ -18,7 +18,7 @@
*
* @package CodeIgniter
* @author EllisLab Dev Team
- * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc. (http://ellislab.com/)
+ * @copyright Copyright (c) 2008 - 2012, EllisLab, Inc. (http://ellislab.com/)
* @license http://opensource.org/licenses/AFL-3.0 Academic Free License (AFL 3.0)
* @link http://codeigniter.com
* @since Version 1.0
@@ -253,6 +253,9 @@
|
| If you use the Encryption class or the Session class you
| MUST set an encryption key. See the user guide for info.
+|
+| http://codeigniter.com/user_guide/libraries/encryption.html
+| http://codeigniter.com/user_guide/libraries/sessions.html
|
*/
$config['encryption_key'] = '';
@@ -294,12 +297,14 @@
| 'cookie_domain' = Set to .your-domain.com for site-wide cookies
| 'cookie_path' = Typically will be a forward slash
| 'cookie_secure' = Cookies will only be set if a secure HTTPS connection exists.
+| 'cookie_httponly' = Cookie will only be accessible via HTTP(S) (no javascript)
|
*/
$config['cookie_prefix'] = "";
$config['cookie_domain'] = "";
$config['cookie_path'] = "/";
$config['cookie_secure'] = FALSE;
+$config['cookie_httponly'] = FALSE;
/*
|--------------------------------------------------------------------------
@@ -323,12 +328,14 @@
| 'csrf_token_name' = The token name
| 'csrf_cookie_name' = The cookie name
| 'csrf_expire' = The number in seconds the token should expire.
+| 'csrf_regenerate' = Regenerate token on every submission
| 'csrf_exclude_uris' = Array of URIs which ignore CSRF checks
*/
$config['csrf_protection'] = FALSE;
$config['csrf_token_name'] = 'csrf_test_name';
$config['csrf_cookie_name'] = 'csrf_cookie_name';
$config['csrf_expire'] = 7200;
+$config['csrf_regenerate'] = TRUE;
$config['csrf_exclude_uris'] = array();
/*
@@ -1,13 +1,13 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
/**
* CodeIgniter
*
- * An open source application development framework for PHP 5.1.6 or newer
+ * An open source application development framework for PHP 5.2.4 or newer
*
* NOTICE OF LICENSE
- *
+ *
* Licensed under the Academic Free License version 3.0
- *
+ *
* This source file is subject to the Academic Free License (AFL 3.0) that is
* bundled with this package in the files license_afl.txt / license_afl.rst.
* It is also available through the world wide web at this URL:
@@ -18,7 +18,7 @@
*
* @package CodeIgniter
* @author EllisLab Dev Team
- * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc. (http://ellislab.com/)
+ * @copyright Copyright (c) 2008 - 2012, EllisLab, Inc. (http://ellislab.com/)
* @license http://opensource.org/licenses/AFL-3.0 Academic Free License (AFL 3.0)
* @link http://codeigniter.com
* @since Version 1.0
@@ -66,8 +66,8 @@
| Display Debug backtrace
|--------------------------------------------------------------------------
|
-| If set to TRUE, a backtrace will be displayed along with php errors. If
-| error_reporting is disabled, the backtrace will not display, regardless
+| If set to TRUE, a backtrace will be displayed along with php errors. If
+| error_reporting is disabled, the backtrace will not display, regardless
| of this setting
|
*/
@@ -1,13 +1,13 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
/**
* CodeIgniter
*
- * An open source application development framework for PHP 5.1.6 or newer
+ * An open source application development framework for PHP 5.2.4 or newer
*
* NOTICE OF LICENSE
- *
+ *
* Licensed under the Academic Free License version 3.0
- *
+ *
* This source file is subject to the Academic Free License (AFL 3.0) that is
* bundled with this package in the files license_afl.txt / license_afl.rst.
* It is also available through the world wide web at this URL:
@@ -18,7 +18,7 @@
*
* @package CodeIgniter
* @author EllisLab Dev Team
- * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc. (http://ellislab.com/)
+ * @copyright Copyright (c) 2008 - 2012, EllisLab, Inc. (http://ellislab.com/)
* @license http://opensource.org/licenses/AFL-3.0 Academic Free License (AFL 3.0)
* @link http://codeigniter.com
* @since Version 1.0
@@ -37,14 +37,16 @@
| EXPLANATION OF VARIABLES
| -------------------------------------------------------------------
|
+| ['dsn'] The full DSN string describe a connection to the database.
| ['hostname'] The hostname of your database server.
| ['username'] The username used to connect to the database
| ['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, pdo, postgre, odbc, mssql, sqlite, oci8
+| ['dbdriver'] The database type. e.g.: mysql. Currently supported:
+| cubrid, interbase, mssql, mysql, mysqli, oci8,
+| odbc, pdo, postgre, sqlite, sqlite3, sqlsrv
| ['dbprefix'] You can add an optional prefix, which will be added
-| to the table name when using the Active Record class
+| to the table name when using the Query Builder class
| ['pconnect'] TRUE/FALSE - Whether to use a persistent connection
| ['db_debug'] TRUE/FALSE - Whether database errors should be displayed.
| ['cache_on'] TRUE/FALSE - Enables/disables query caching
@@ -62,33 +64,37 @@
| ['autoinit'] Whether or not to automatically initialize the database.
| ['stricton'] TRUE/FALSE - forces 'Strict Mode' connections
| - good for ensuring strict SQL while developing
+| ['failover'] array - A array with 0 or more data for connections if the main should fail.
|
| The $active_group variable lets you choose which connection group to
| make active. By default there is only one group (the 'default' group).
|
-| The $active_record variables lets you determine whether or not to load
-| the active record class
+| The $query_builder variables lets you determine whether or not to load
+| the query builder class
*/
$active_group = 'default';
-$active_record = TRUE;
-
-$db['default']['hostname'] = 'localhost';
-$db['default']['username'] = '';
-$db['default']['password'] = '';
-$db['default']['database'] = '';
-$db['default']['dbdriver'] = 'mysql';
-$db['default']['dbprefix'] = '';
-$db['default']['pconnect'] = TRUE;
-$db['default']['db_debug'] = TRUE;
-$db['default']['cache_on'] = FALSE;
-$db['default']['cachedir'] = '';
-$db['default']['char_set'] = 'utf8';
-$db['default']['dbcollat'] = 'utf8_general_ci';
-$db['default']['swap_pre'] = '';
-$db['default']['autoinit'] = TRUE;
-$db['default']['stricton'] = FALSE;
+$query_builder = TRUE;
+$db['default'] = array(
+ 'dsn' => '',
+ 'hostname' => 'localhost',
+ 'username' => '',
+ 'password' => '',
+ 'database' => '',
+ 'dbdriver' => 'mysqli',
+ 'dbprefix' => '',
+ 'pconnect' => FALSE,
+ 'db_debug' => TRUE,
+ 'cache_on' => FALSE,
+ 'cachedir' => '',
+ 'char_set' => 'utf8',
+ 'dbcollat' => 'utf8_general_ci',
+ 'swap_pre' => '',
+ 'autoinit' => TRUE,
+ 'stricton' => FALSE,
+ 'failover' => array()
+);
/* End of file database.php */
/* Location: ./application/config/database.php */
@@ -1,13 +1,13 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
/**
* CodeIgniter
*
- * An open source application development framework for PHP 5.1.6 or newer
+ * An open source application development framework for PHP 5.2.4 or newer
*
* NOTICE OF LICENSE
- *
+ *
* Licensed under the Academic Free License version 3.0
- *
+ *
* This source file is subject to the Academic Free License (AFL 3.0) that is
* bundled with this package in the files license_afl.txt / license_afl.rst.
* It is also available through the world wide web at this URL:
@@ -18,23 +18,33 @@
*
* @package CodeIgniter
* @author EllisLab Dev Team
- * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc. (http://ellislab.com/)
+ * @copyright Copyright (c) 2008 - 2012, EllisLab, Inc. (http://ellislab.com/)
* @license http://opensource.org/licenses/AFL-3.0 Academic Free License (AFL 3.0)
* @link http://codeigniter.com
* @since Version 1.0
* @filesource
*/
$_doctypes = array(
- 'xhtml11' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">',
- 'xhtml1-strict' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">',
- 'xhtml1-trans' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">',
- 'xhtml1-frame' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">',
- 'xhtml-basic11' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML Basic 1.1//EN" "http://www.w3.org/TR/xhtml-basic/xhtml-basic11.dtd">',
- 'html5' => '<!DOCTYPE html>',
- 'html4-strict' => '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">',
- 'html4-trans' => '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">',
- 'html4-frame' => '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">'
+ 'xhtml11' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">',
+ 'xhtml1-strict' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">',
+ 'xhtml1-trans' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">',
+ 'xhtml1-frame' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">',
+ 'xhtml-basic11' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML Basic 1.1//EN" "http://www.w3.org/TR/xhtml-basic/xhtml-basic11.dtd">',
+ 'html5' => '<!DOCTYPE html>',
+ 'html4-strict' => '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">',
+ 'html4-trans' => '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">',
+ 'html4-frame' => '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">',
+ 'mathml1' => '<!DOCTYPE math SYSTEM "http://www.w3.org/Math/DTD/mathml1/mathml.dtd">',
+ 'mathml2' => '<!DOCTYPE math PUBLIC "-//W3C//DTD MathML 2.0//EN" "http://www.w3.org/Math/DTD/mathml2/mathml2.dtd">',
+ 'svg10' => '<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">',
+ 'svg11' => '<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">',
+ 'svg11-basic' => '<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Basic//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-basic.dtd">',
+ 'svg11-tiny' => '<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">',
+ '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">',
+ '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">',
+ 'xhtml-rdfa-1' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.0//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-1.dtd">',
+ 'xhtml-rdfa-2' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.1//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-2.dtd">'
);
/* End of file doctypes.php */
Oops, something went wrong.

0 comments on commit 45429a7

Please sign in to comment.