Permalink
Browse files

Merged Alex Bilbies MSSQL changes.

  • Loading branch information...
2 parents 3a43c7a + 3ef65bd commit 0fe54dbaf89a8337d27b9203f74891cf1a799715 philsturgeon committed Jun 15, 2011
Showing with 4,088 additions and 3,118 deletions.
  1. +8 −0 .hgflow
  2. +2 −1 .hgignore
  3. +12 −12 application/config/autoload.php
  4. +20 −20 application/config/config.php
  5. +3 −3 application/config/constants.php
  6. +11 −5 application/config/database.php
  7. +1 −1 application/config/foreign_chars.php
  8. +2 −2 application/config/hooks.php
  9. +4 −4 application/config/mimes.php
  10. +1 −1 application/config/profiler.php
  11. +1 −1 application/config/routes.php
  12. +2 −2 application/config/smileys.php
  13. +3 −3 application/config/user_agents.php
  14. +2 −2 application/controllers/welcome.php
  15. +43 −15 application/errors/error_404.php
  16. +43 −15 application/errors/error_db.php
  17. +43 −15 application/errors/error_general.php
  18. +1 −1 application/errors/error_php.php
  19. +0 −32 application/migrations/001_Create_accounts.php
  20. +66 −42 application/views/welcome_message.php
  21. +20 −16 index.php
  22. +2 −2 license.txt
  23. +2 −2 system/core/Benchmark.php
  24. +59 −45 system/core/CodeIgniter.php
  25. +84 −52 system/core/Common.php
  26. +35 −26 system/core/Config.php
  27. +3 −6 system/core/Controller.php
  28. +5 −5 system/core/Exceptions.php
  29. +10 −2 system/core/Hooks.php
  30. +19 −21 system/core/Input.php
  31. +13 −6 system/core/Lang.php
  32. +171 −130 system/core/Loader.php
  33. +1 −1 system/core/Model.php
  34. +23 −15 system/core/Output.php
  35. +24 −16 system/core/Router.php
  36. +366 −272 system/{libraries → core}/Security.php
  37. +44 −33 system/core/URI.php
  38. +2 −2 system/core/Utf8.php
  39. +15 −20 system/database/DB.php
  40. +37 −37 system/database/DB_active_rec.php
  41. +3 −3 system/database/DB_cache.php
  42. +20 −20 system/database/DB_driver.php
  43. +1 −1 system/database/DB_forge.php
  44. +58 −53 system/database/DB_result.php
  45. +3 −3 system/database/DB_utility.php
  46. +6 −4 system/database/drivers/mssql/mssql_driver.php
  47. +2 −2 system/database/drivers/mssql/mssql_forge.php
  48. +2 −2 system/database/drivers/mssql/mssql_result.php
  49. +1 −1 system/database/drivers/mssql/mssql_utility.php
  50. +22 −7 system/database/drivers/mysql/mysql_driver.php
  51. +2 −2 system/database/drivers/mysql/mysql_forge.php
  52. +2 −2 system/database/drivers/mysql/mysql_result.php
  53. +2 −2 system/database/drivers/mysql/mysql_utility.php
  54. +19 −4 system/database/drivers/mysqli/mysqli_driver.php
  55. +2 −2 system/database/drivers/mysqli/mysqli_forge.php
  56. +2 −2 system/database/drivers/mysqli/mysqli_result.php
  57. +1 −1 system/database/drivers/mysqli/mysqli_utility.php
  58. +69 −69 system/database/drivers/oci8/oci8_driver.php
  59. +2 −2 system/database/drivers/oci8/oci8_forge.php
  60. +17 −17 system/database/drivers/oci8/oci8_result.php
  61. +1 −1 system/database/drivers/oci8/oci8_utility.php
  62. +1 −1 system/database/drivers/odbc/odbc_driver.php
  63. +2 −2 system/database/drivers/odbc/odbc_forge.php
  64. +2 −2 system/database/drivers/odbc/odbc_result.php
  65. +1 −1 system/database/drivers/odbc/odbc_utility.php
  66. +19 −1 system/database/drivers/postgre/postgre_driver.php
  67. +5 −5 system/database/drivers/postgre/postgre_forge.php
  68. +2 −2 system/database/drivers/postgre/postgre_result.php
  69. +1 −1 system/database/drivers/postgre/postgre_utility.php
  70. +1 −1 system/database/drivers/sqlite/sqlite_driver.php
  71. +3 −3 system/database/drivers/sqlite/sqlite_forge.php
  72. +2 −2 system/database/drivers/sqlite/sqlite_result.php
  73. +2 −2 system/database/drivers/sqlite/sqlite_utility.php
  74. +4 −4 system/helpers/array_helper.php
  75. +10 −10 system/helpers/captcha_helper.php
  76. +3 −3 system/helpers/cookie_helper.php
  77. +11 −11 system/helpers/date_helper.php
  78. +2 −2 system/helpers/directory_helper.php
  79. +9 −2 system/helpers/download_helper.php
  80. +1 −1 system/helpers/email_helper.php
  81. +12 −3 system/helpers/file_helper.php
  82. +25 −20 system/helpers/form_helper.php
  83. +18 −8 system/helpers/html_helper.php
  84. +14 −12 system/helpers/inflector_helper.php
  85. +1 −1 system/helpers/language_helper.php
  86. +1 −1 system/helpers/number_helper.php
  87. +2 −2 system/helpers/path_helper.php
  88. +3 −35 system/helpers/security_helper.php
  89. +13 −11 system/helpers/smiley_helper.php
  90. +4 −4 system/helpers/string_helper.php
  91. +11 −9 system/helpers/text_helper.php
  92. +3 −4 system/helpers/typography_helper.php
  93. +3 −3 system/helpers/url_helper.php
  94. +2 −2 system/helpers/xml_helper.php
  95. +3 −3 system/language/english/email_lang.php
  96. +3 −0 system/language/english/form_validation_lang.php
  97. +7 −7 system/language/english/ftp_lang.php
  98. +5 −5 system/language/english/imglib_lang.php
  99. +3 −0 system/language/english/profiler_lang.php
  100. +18 −18 system/libraries/Cache/Cache.php
  101. +13 −13 system/libraries/Cache/drivers/Cache_apc.php
  102. +13 −13 system/libraries/Cache/drivers/Cache_dummy.php
  103. +21 −21 system/libraries/Cache/drivers/Cache_file.php
  104. +1 −1 system/libraries/Cache/drivers/Cache_memcached.php
  105. +10 −10 system/libraries/Calendar.php
  106. +11 −11 system/libraries/Cart.php
  107. +15 −15 system/libraries/Driver.php
  108. +45 −45 system/libraries/Email.php
  109. +2 −2 system/libraries/Encrypt.php
  110. +21 −22 system/libraries/Form_validation.php
  111. +4 −4 system/libraries/Ftp.php
  112. +59 −59 system/libraries/Image_lib.php
  113. +6 −6 system/libraries/Javascript.php
  114. +5 −5 system/libraries/Log.php
  115. +9 −9 system/libraries/Pagination.php
  116. +9 −9 system/libraries/Parser.php
  117. +80 −24 system/libraries/Profiler.php
  118. +19 −19 system/libraries/Session.php
  119. +4 −4 system/libraries/Sha1.php
  120. +6 −6 system/libraries/Table.php
  121. +8 −8 system/libraries/Trackback.php
  122. +18 −18 system/libraries/Typography.php
  123. +1 −1 system/libraries/Unit_test.php
  124. +28 −24 system/libraries/Upload.php
  125. +10 −2 system/libraries/User_agent.php
  126. +43 −53 system/libraries/Xmlrpc.php
  127. +22 −22 system/libraries/Xmlrpcs.php
  128. +6 −6 system/libraries/Zip.php
  129. +109 −109 system/libraries/javascript/Jquery.php
  130. +147 −60 user_guide/changelog.html
  131. +37 −37 user_guide/database/active_record.html
  132. +18 −18 user_guide/database/caching.html
  133. +5 −5 user_guide/database/call_function.html
  134. +10 −10 user_guide/database/configuration.html
  135. +4 −4 user_guide/database/connecting.html
  136. +7 −7 user_guide/database/examples.html
  137. +3 −3 user_guide/database/fields.html
  138. +6 −6 user_guide/database/forge.html
  139. +7 −7 user_guide/database/helpers.html
  140. +3 −3 user_guide/database/index.html
  141. +8 −8 user_guide/database/queries.html
  142. +11 −11 user_guide/database/results.html
  143. +4 −4 user_guide/database/table_data.html
  144. +8 −8 user_guide/database/transactions.html
  145. +11 −11 user_guide/database/utilities.html
  146. +1 −1 user_guide/doc_style/index.html
  147. +1 −1 user_guide/doc_style/template.html
  148. +9 −9 user_guide/general/alternative_php.html
  149. +1 −1 user_guide/general/ancillary_classes.html
  150. +2 −2 user_guide/general/autoloader.html
  151. +5 −5 user_guide/general/caching.html
  152. +150 −0 user_guide/general/cli.html
  153. +4 −4 user_guide/general/common_functions.html
  154. +28 −28 user_guide/general/controllers.html
  155. +3 −3 user_guide/general/core_classes.html
  156. +1 −1 user_guide/general/creating_drivers.html
  157. +18 −18 user_guide/general/creating_libraries.html
  158. +4 −3 user_guide/general/credits.html
  159. +4 −4 user_guide/general/drivers.html
  160. +25 −25 user_guide/general/environments.html
  161. +10 −10 user_guide/general/errors.html
  162. +14 −14 user_guide/general/helpers.html
  163. +9 −9 user_guide/general/hooks.html
  164. +2 −2 user_guide/general/libraries.html
  165. +5 −5 user_guide/general/managing_apps.html
  166. +10 −10 user_guide/general/models.html
  167. +56 −51 user_guide/general/profiling.html
  168. +1 −1 user_guide/general/quick_reference.html
  169. +1 −1 user_guide/general/requirements.html
  170. +4 −3 user_guide/general/reserved_names.html
  171. +12 −7 user_guide/general/routing.html
  172. +14 −20 user_guide/general/security.html
  173. +33 −33 user_guide/general/styleguide.html
  174. +5 −5 user_guide/general/urls.html
  175. +15 −15 user_guide/general/views.html
  176. +9 −9 user_guide/helpers/array_helper.html
  177. +10 −10 user_guide/helpers/captcha_helper.html
  178. +6 −6 user_guide/helpers/cookie_helper.html
  179. +17 −17 user_guide/helpers/date_helper.html
  180. +3 −3 user_guide/helpers/directory_helper.html
  181. +1 −1 user_guide/helpers/download_helper.html
  182. +1 −1 user_guide/helpers/email_helper.html
  183. +9 −9 user_guide/helpers/file_helper.html
  184. +29 −29 user_guide/helpers/form_helper.html
  185. +18 −13 user_guide/helpers/html_helper.html
  186. +6 −6 user_guide/helpers/inflector_helper.html
  187. +2 −2 user_guide/helpers/language_helper.html
  188. +2 −2 user_guide/helpers/number_helper.html
  189. +1 −1 user_guide/helpers/path_helper.html
  190. +8 −8 user_guide/helpers/security_helper.html
  191. +5 −5 user_guide/helpers/smiley_helper.html
  192. +4 −4 user_guide/helpers/string_helper.html
  193. +16 −16 user_guide/helpers/text_helper.html
  194. +2 −2 user_guide/helpers/typography_helper.html
  195. +25 −25 user_guide/helpers/url_helper.html
  196. +2 −2 user_guide/helpers/xml_helper.html
  197. +1 −1 user_guide/index.html
  198. +4 −3 user_guide/installation/downloads.html
  199. +9 −9 user_guide/installation/index.html
  200. +3 −3 user_guide/installation/troubleshooting.html
  201. +1 −1 user_guide/installation/upgrade_120.html
  202. +5 −5 user_guide/installation/upgrade_130.html
  203. +2 −2 user_guide/installation/upgrade_131.html
  204. +2 −2 user_guide/installation/upgrade_132.html
  205. +5 −5 user_guide/installation/upgrade_133.html
  206. +4 −4 user_guide/installation/upgrade_140.html
  207. +6 −6 user_guide/installation/upgrade_141.html
  208. +5 −5 user_guide/installation/upgrade_150.html
  209. +2 −2 user_guide/installation/upgrade_152.html
  210. +1 −1 user_guide/installation/upgrade_153.html
  211. +1 −1 user_guide/installation/upgrade_154.html
  212. +4 −4 user_guide/installation/upgrade_160.html
  213. +1 −1 user_guide/installation/upgrade_161.html
  214. +1 −1 user_guide/installation/upgrade_162.html
  215. +1 −1 user_guide/installation/upgrade_163.html
  216. +5 −5 user_guide/installation/upgrade_170.html
  217. +1 −1 user_guide/installation/upgrade_171.html
  218. +1 −1 user_guide/installation/upgrade_172.html
  219. +6 −6 user_guide/installation/upgrade_200.html
  220. +17 −1 user_guide/installation/upgrade_201.html
  221. +97 −0 user_guide/installation/upgrade_202.html
  222. +125 −0 user_guide/installation/upgrade_203.html
  223. +4 −4 user_guide/installation/upgrade_b11.html
  224. +3 −1 user_guide/installation/upgrading.html
  225. +5 −5 user_guide/libraries/benchmark.html
  226. +11 −11 user_guide/libraries/caching.html
  227. +7 −7 user_guide/libraries/calendar.html
  228. +24 −24 user_guide/libraries/cart.html
  229. +21 −21 user_guide/libraries/config.html
  230. +13 −13 user_guide/libraries/email.html
  231. +18 −18 user_guide/libraries/encryption.html
  232. +30 −30 user_guide/libraries/file_uploading.html
  233. +48 −48 user_guide/libraries/form_validation.html
  234. +19 −19 user_guide/libraries/ftp.html
  235. +33 −33 user_guide/libraries/image_lib.html
  236. +25 −21 user_guide/libraries/input.html
  237. +18 −18 user_guide/libraries/javascript.html
  238. +12 −12 user_guide/libraries/language.html
  239. +41 −29 user_guide/libraries/loader.html
  240. +11 −11 user_guide/libraries/output.html
  241. +12 −12 user_guide/libraries/pagination.html
  242. +9 −9 user_guide/libraries/parser.html
  243. +5 −5 user_guide/libraries/security.html
  244. +45 −26 user_guide/libraries/sessions.html
  245. +15 −15 user_guide/libraries/table.html
  246. +14 −14 user_guide/libraries/trackback.html
  247. +3 −3 user_guide/libraries/typography.html
  248. +9 −9 user_guide/libraries/unit_testing.html
  249. +8 −8 user_guide/libraries/uri.html
  250. +6 −6 user_guide/libraries/user_agent.html
  251. +24 −24 user_guide/libraries/xmlrpc.html
  252. +18 −18 user_guide/libraries/zip.html
  253. +2 −2 user_guide/license.html
  254. +1 −1 user_guide/nav/hacks.txt
  255. +2 −2 user_guide/nav/moo.fx.js
  256. +3 −0 user_guide/nav/nav.js
  257. +46 −46 user_guide/nav/prototype.lite.js
  258. +2 −2 user_guide/overview/appflow.html
  259. +7 −7 user_guide/overview/at_a_glance.html
  260. +1 −1 user_guide/overview/cheatsheets.html
  261. +4 −4 user_guide/overview/features.html
  262. +2 −2 user_guide/overview/getting_started.html
  263. +4 −4 user_guide/overview/goals.html
  264. +1 −1 user_guide/overview/index.html
  265. +4 −4 user_guide/overview/mvc.html
  266. +5 −1 user_guide/toc.html
  267. +1 −1 user_guide/userguide.css
View
@@ -0,0 +1,8 @@
+[Basic]
+develop = develop
+feature = feature/
+version_tag =
+publish = default
+release = release/
+hotfix = hotfix/
+
View
@@ -3,4 +3,5 @@ syntax: glob
.DS_Store
syntax: regexp
-system/cache/(?!index\.html|\.htaccess)
+application/cache/(?!index\.html|\.htaccess)
+application/logs/(?!index\.html|\.htaccess)
@@ -1,4 +1,4 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
/*
| -------------------------------------------------------------------
| AUTO-LOADER
@@ -8,7 +8,7 @@
| In order to keep the framework as light-weight as possible only the
| absolute minimal resources are loaded by default. For example,
| the database is not connected to automatically since no assumption
-| is made regarding whether you intend to use it. This file lets
+| is made regarding whether you intend to use it. This file lets
| you globally define which systems you would like loaded with every
| request.
|
@@ -29,20 +29,20 @@
/*
| -------------------------------------------------------------------
-| Auto-load Packges
+| Auto-load Packges
| -------------------------------------------------------------------
| Prototype:
|
-| $autoload['packages'] = array(APPPATH.'third_party', '/usr/local/shared');
+| $autoload['packages'] = array(APPPATH.'third_party', '/usr/local/shared');
|
*/
-$autoload['packages'] = array(APPPATH.'third_party');
+$autoload['packages'] = array();
/*
| -------------------------------------------------------------------
-| Auto-load Libraries
+| Auto-load Libraries
| -------------------------------------------------------------------
| These are the classes located in the system/libraries folder
| or in your application/libraries folder.
@@ -57,7 +57,7 @@
/*
| -------------------------------------------------------------------
-| Auto-load Helper Files
+| Auto-load Helper Files
| -------------------------------------------------------------------
| Prototype:
|
@@ -69,14 +69,14 @@
/*
| -------------------------------------------------------------------
-| Auto-load Config files
+| Auto-load Config files
| -------------------------------------------------------------------
| Prototype:
|
| $autoload['config'] = array('config1', 'config2');
|
| NOTE: This item is intended for use ONLY if you have created custom
-| config files. Otherwise, leave it blank.
+| config files. Otherwise, leave it blank.
|
*/
@@ -85,13 +85,13 @@
/*
| -------------------------------------------------------------------
-| Auto-load Language files
+| Auto-load Language files
| -------------------------------------------------------------------
| Prototype:
|
| $autoload['language'] = array('lang1', 'lang2');
|
-| NOTE: Do not include the "_lang" part of your file. For example
+| NOTE: Do not include the "_lang" part of your file. For example
| "codeigniter_lang.php" would be referenced as array('codeigniter');
|
*/
@@ -101,7 +101,7 @@
/*
| -------------------------------------------------------------------
-| Auto-load Models
+| Auto-load Models
| -------------------------------------------------------------------
| Prototype:
|
@@ -1,4 +1,4 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
/*
|--------------------------------------------------------------------------
@@ -34,7 +34,7 @@
|--------------------------------------------------------------------------
|
| This item determines which server global should be used to retrieve the
-| URI string. The default setting of 'AUTO' works for most servers.
+| URI string. The default setting of 'AUTO' works for most servers.
| If your links do not seem to work, try one of the other delicious flavors:
|
| 'AUTO' Default - auto detects
@@ -88,7 +88,7 @@
|--------------------------------------------------------------------------
|
| If you would like to use the 'hooks' feature you must enable it by
-| setting this variable to TRUE (boolean). See the user guide for details.
+| setting this variable to TRUE (boolean). See the user guide for details.
|
*/
$config['enable_hooks'] = FALSE;
@@ -100,7 +100,7 @@
|--------------------------------------------------------------------------
|
| This item allows you to set the filename/classname prefix when extending
-| native libraries. For more information please see the user guide:
+| native libraries. For more information please see the user guide:
|
| http://codeigniter.com/user_guide/general/core_classes.html
| http://codeigniter.com/user_guide/general/creating_libraries.html
@@ -115,11 +115,11 @@
|--------------------------------------------------------------------------
|
| This lets you specify with a regular expression which characters are permitted
-| within your URLs. When someone tries to submit a URL with disallowed
+| within your URLs. When someone tries to submit a URL with disallowed
| characters they will get a warning message.
|
| As a security measure you are STRONGLY encouraged to restrict URLs to
-| as few characters as possible. By default only these are allowed: a-z 0-9~%.:_-
+| as few characters as possible. By default only these are allowed: a-z 0-9~%.:_-
|
| Leave blank to allow all characters -- but only if you are insane.
|
@@ -137,7 +137,7 @@
| By default CodeIgniter uses search-engine friendly segment based URLs:
| example.com/who/what/where/
|
-| By default CodeIgniter enables access to the $_GET array. If for some
+| By default CodeIgniter enables access to the $_GET array. If for some
| reason you would like to disable it, set 'allow_get_array' to FALSE.
|
| You can optionally enable standard query string based URLs:
@@ -210,7 +210,7 @@
|--------------------------------------------------------------------------
|
| Leave this BLANK unless you would like to set something other than the default
-| system/cache/ folder. Use a full server path with trailing slash.
+| system/cache/ folder. Use a full server path with trailing slash.
|
*/
$config['cache_path'] = '';
@@ -221,7 +221,7 @@
|--------------------------------------------------------------------------
|
| If you use the Encryption class or the Session class you
-| MUST set an encryption key. See the user guide for info.
+| MUST set an encryption key. See the user guide for info.
|
*/
$config['encryption_key'] = '';
@@ -233,9 +233,9 @@
|
| 'sess_cookie_name' = the name you want for the cookie
| 'sess_expiration' = the number of SECONDS you want the session to last.
-| by default sessions last 7200 seconds (two hours). Set to zero for no expiration.
+| by default sessions last 7200 seconds (two hours). Set to zero for no expiration.
| 'sess_expire_on_close' = Whether to cause the session to expire automatically
-| when the browser window is closed
+| when the browser window is closed
| 'sess_encrypt_cookie' = Whether to encrypt the cookie
| 'sess_use_database' = Whether to save the session data to a database
| 'sess_table_name' = The name of the session database table
@@ -261,8 +261,8 @@
|
| 'cookie_prefix' = Set a prefix if you need to avoid collisions
| '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_path' = Typically will be a forward slash
+| 'cookie_secure' = Cookies will only be set if a secure HTTPS connection exists.
|
*/
$config['cookie_prefix'] = "";
@@ -303,16 +303,16 @@
| Output Compression
|--------------------------------------------------------------------------
|
-| Enables Gzip output compression for faster page loads. When enabled,
+| Enables Gzip output compression for faster page loads. When enabled,
| the output class will test whether your server supports Gzip.
| Even if it does, however, not all browsers support compression
| so enable only if you are reasonably sure your visitors can handle it.
|
-| VERY IMPORTANT: If you are getting a blank page when compression is enabled it
+| VERY IMPORTANT: If you are getting a blank page when compression is enabled it
| means you are prematurely outputting something to your browser. It could
-| even be a line of whitespace at the end of one of your scripts. For
+| even be a line of whitespace at the end of one of your scripts. For
| compression to work, nothing can be sent before the output buffer is called
-| by the output class. Do not 'echo' any values with compression enabled.
+| by the output class. Do not 'echo' any values with compression enabled.
|
*/
$config['compress_output'] = FALSE;
@@ -322,9 +322,9 @@
| Master Time Reference
|--------------------------------------------------------------------------
|
-| Options are 'local' or 'gmt'. This pref tells the system whether to use
+| Options are 'local' or 'gmt'. This pref tells the system whether to use
| your server's local time as the master 'now' reference, or convert it to
-| GMT. See the 'date helper' page of the user guide for information
+| GMT. See the 'date helper' page of the user guide for information
| regarding date handling.
|
*/
@@ -338,7 +338,7 @@
|
| If your PHP installation does not have short tag support enabled CI
| can rewrite the tags on-the-fly, enabling you to utilize that syntax
-| in your view files. Options are TRUE or FALSE (boolean)
+| in your view files. Options are TRUE or FALSE (boolean)
|
*/
$config['rewrite_short_tags'] = FALSE;
@@ -1,15 +1,15 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
/*
|--------------------------------------------------------------------------
| File and Directory Modes
|--------------------------------------------------------------------------
|
| These prefs are used when checking and setting modes when working
-| with the file system. The defaults are fine on servers with proper
+| with the file system. The defaults are fine on servers with proper
| security, but you may wish (or even need) to change the values in
| certain environments (Apache running a separate process for each
-| user, PHP under CGI with Apache suEXEC, etc.). Octal values should
+| user, PHP under CGI with Apache suEXEC, etc.). Octal values should
| always be used to set the mode correctly.
|
*/
@@ -1,4 +1,4 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
/*
| -------------------------------------------------------------------
| DATABASE CONNECTIVITY SETTINGS
@@ -16,23 +16,29 @@
| ['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, postgre, odbc, mssql, sqlite, oci8
+| ['dbdriver'] The database type. ie: mysql. Currently supported:
+| mysql, mysqli, 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
+| to the table name when using the Active Record 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
| ['cachedir'] The path to the folder where cache files should be stored
| ['char_set'] The character set used in communicating with the database
| ['dbcollat'] The character collation used in communicating with the database
+| NOTE: For MySQL and MySQLi databases, this setting is only used
+| as a backup if your server is running PHP < 5.2.3 or MySQL < 5.0.7.
+| There is an incompatibility in PHP with mysql_real_escape_string() which
+| can make your site vulnerable to SQL injection if you are using a
+| multi-byte character set and are running versions lower than these.
+| Sites using Latin-1 or UTF-8 database character set and collation are unaffected.
| ['swap_pre'] A default table prefix that should be swapped with the dbprefix
| ['autoinit'] Whether or not to automatically initialize the database.
| ['stricton'] TRUE/FALSE - forces 'Strict Mode' connections
| - good for ensuring strict SQL while developing
|
| The $active_group variable lets you choose which connection group to
-| make active. By default there is only one group (the 'default' group).
+| 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
@@ -1,4 +1,4 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
/*
| -------------------------------------------------------------------
| Foreign Characters
@@ -1,10 +1,10 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
/*
| -------------------------------------------------------------------------
| Hooks
| -------------------------------------------------------------------------
| This file lets you define "hooks" to extend CI without hacking the core
-| files. Please see the user guide for info:
+| files. Please see the user guide for info:
|
| http://codeigniter.com/user_guide/general/hooks.html
|
@@ -1,9 +1,9 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
/*
| -------------------------------------------------------------------
| MIME TYPES
| -------------------------------------------------------------------
-| This file contains an array of mime types. It is used by the
+| This file contains an array of mime types. It is used by the
| Upload class to help identify allowed file types.
|
*/
@@ -51,7 +51,7 @@
'tgz' => array('application/x-tar', 'application/x-gzip-compressed'),
'xhtml' => 'application/xhtml+xml',
'xht' => 'application/xhtml+xml',
- 'zip' => array('application/x-zip', 'application/zip', 'application/x-zip-compressed'),
+ 'zip' => array('application/x-zip', 'application/zip', 'application/x-zip-compressed'),
'mid' => 'audio/midi',
'midi' => 'audio/midi',
'mpga' => 'audio/mpeg',
@@ -71,7 +71,7 @@
'jpeg' => array('image/jpeg', 'image/pjpeg'),
'jpg' => array('image/jpeg', 'image/pjpeg'),
'jpe' => array('image/jpeg', 'image/pjpeg'),
- 'png' => array('image/png', 'image/x-png'),
+ 'png' => array('image/png', 'image/x-png'),
'tiff' => 'image/tiff',
'tif' => 'image/tiff',
'css' => 'text/css',
@@ -1,4 +1,4 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
/*
| -------------------------------------------------------------------------
| Profiler Sections
@@ -1,4 +1,4 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
/*
| -------------------------------------------------------------------------
| URI ROUTING
@@ -1,10 +1,10 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
/*
| -------------------------------------------------------------------
| SMILEYS
| -------------------------------------------------------------------
| This file contains an array of smileys for use with the emoticon helper.
-| Individual images can be used to replace multiple simileys. For example:
+| Individual images can be used to replace multiple simileys. For example:
| :-) and :) use the same image replacement.
|
| Please see user guide for more info:
@@ -1,11 +1,11 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
/*
| -------------------------------------------------------------------
| USER AGENT TYPES
| -------------------------------------------------------------------
-| This file contains four arrays of user agent data. It is used by the
+| This file contains four arrays of user agent data. It is used by the
| User Agent Class to help identify browser, platform, robot, and
-| mobile device data. The array keys are used to identify the device
+| mobile device data. The array keys are used to identify the device
| and the array values are used to set the actual name of the item.
|
*/
Oops, something went wrong.

0 comments on commit 0fe54db

Please sign in to comment.