Skip to content
This repository
Browse code

backed out 648b42a75739, which was a NON-trivial whitespace commit. I…

…t broke the Typography class's string replacements, for instance
  • Loading branch information...
commit 4b9c62980599228f070b401c7673dce8085b0c61 1 parent 114ab09
Derek Jones derekjones authored

Showing 230 changed files with 2,110 additions and 2,110 deletions. Show diff stats Hide diff stats

  1. +11 11 application/config/autoload.php
  2. +20 20 application/config/config.php
  3. +3 3 application/config/constants.php
  4. +5 5 application/config/database.php
  5. +1 1  application/config/foreign_chars.php
  6. +2 2 application/config/hooks.php
  7. +4 4 application/config/mimes.php
  8. +1 1  application/config/profiler.php
  9. +1 1  application/config/routes.php
  10. +2 2 application/config/smileys.php
  11. +3 3 application/config/user_agents.php
  12. +2 2 application/controllers/welcome.php
  13. +1 1  application/errors/error_php.php
  14. +15 15 index.php
  15. +2 2 license.txt
  16. +2 2 system/core/Benchmark.php
  17. +34 34 system/core/CodeIgniter.php
  18. +14 14 system/core/Common.php
  19. +9 9 system/core/Config.php
  20. +3 3 system/core/Controller.php
  21. +3 3 system/core/Exceptions.php
  22. +2 2 system/core/Hooks.php
  23. +12 12 system/core/Input.php
  24. +1 1  system/core/Lang.php
  25. +30 30 system/core/Loader.php
  26. +1 1  system/core/Model.php
  27. +10 10 system/core/Output.php
  28. +13 13 system/core/Router.php
  29. +52 52 system/core/Security.php
  30. +7 7 system/core/URI.php
  31. +1 1  system/core/Utf8.php
  32. +8 8 system/database/DB.php
  33. +16 16 system/database/DB_active_rec.php
  34. +3 3 system/database/DB_cache.php
  35. +17 17 system/database/DB_driver.php
  36. +1 1  system/database/DB_forge.php
  37. +53 53 system/database/DB_result.php
  38. +3 3 system/database/DB_utility.php
  39. +1 1  system/database/drivers/mssql/mssql_driver.php
  40. +2 2 system/database/drivers/mssql/mssql_forge.php
  41. +2 2 system/database/drivers/mssql/mssql_result.php
  42. +1 1  system/database/drivers/mssql/mssql_utility.php
  43. +7 7 system/database/drivers/mysql/mysql_driver.php
  44. +2 2 system/database/drivers/mysql/mysql_forge.php
  45. +2 2 system/database/drivers/mysql/mysql_result.php
  46. +2 2 system/database/drivers/mysql/mysql_utility.php
  47. +4 4 system/database/drivers/mysqli/mysqli_driver.php
  48. +2 2 system/database/drivers/mysqli/mysqli_forge.php
  49. +2 2 system/database/drivers/mysqli/mysqli_result.php
  50. +1 1  system/database/drivers/mysqli/mysqli_utility.php
  51. +69 69 system/database/drivers/oci8/oci8_driver.php
  52. +2 2 system/database/drivers/oci8/oci8_forge.php
  53. +17 17 system/database/drivers/oci8/oci8_result.php
  54. +1 1  system/database/drivers/oci8/oci8_utility.php
  55. +1 1  system/database/drivers/odbc/odbc_driver.php
  56. +2 2 system/database/drivers/odbc/odbc_forge.php
  57. +2 2 system/database/drivers/odbc/odbc_result.php
  58. +1 1  system/database/drivers/odbc/odbc_utility.php
  59. +1 1  system/database/drivers/postgre/postgre_driver.php
  60. +5 5 system/database/drivers/postgre/postgre_forge.php
  61. +2 2 system/database/drivers/postgre/postgre_result.php
  62. +1 1  system/database/drivers/postgre/postgre_utility.php
  63. +1 1  system/database/drivers/sqlite/sqlite_driver.php
  64. +3 3 system/database/drivers/sqlite/sqlite_forge.php
  65. +2 2 system/database/drivers/sqlite/sqlite_result.php
  66. +2 2 system/database/drivers/sqlite/sqlite_utility.php
  67. +4 4 system/helpers/array_helper.php
  68. +10 10 system/helpers/captcha_helper.php
  69. +3 3 system/helpers/cookie_helper.php
  70. +11 11 system/helpers/date_helper.php
  71. +2 2 system/helpers/directory_helper.php
  72. +1 1  system/helpers/download_helper.php
  73. +1 1  system/helpers/email_helper.php
  74. +2 2 system/helpers/file_helper.php
  75. +9 9 system/helpers/form_helper.php
  76. +5 5 system/helpers/html_helper.php
  77. +7 7 system/helpers/inflector_helper.php
  78. +1 1  system/helpers/language_helper.php
  79. +1 1  system/helpers/number_helper.php
  80. +2 2 system/helpers/path_helper.php
  81. +2 2 system/helpers/security_helper.php
  82. +6 6 system/helpers/smiley_helper.php
  83. +4 4 system/helpers/string_helper.php
  84. +5 5 system/helpers/text_helper.php
  85. +1 1  system/helpers/typography_helper.php
  86. +3 3 system/helpers/url_helper.php
  87. +2 2 system/helpers/xml_helper.php
  88. +3 3 system/language/english/email_lang.php
  89. +5 5 system/language/english/imglib_lang.php
  90. +15 15 system/libraries/Cache/Cache.php
  91. +12 12 system/libraries/Cache/drivers/Cache_apc.php
  92. +20 20 system/libraries/Cache/drivers/Cache_file.php
  93. +9 9 system/libraries/Calendar.php
  94. +11 11 system/libraries/Cart.php
  95. +1 1  system/libraries/Driver.php
  96. +23 23 system/libraries/Email.php
  97. +1 1  system/libraries/Encrypt.php
  98. +16 16 system/libraries/Form_validation.php
  99. +4 4 system/libraries/Ftp.php
  100. +59 59 system/libraries/Image_lib.php
  101. +6 6 system/libraries/Javascript.php
  102. +4 4 system/libraries/Log.php
  103. +9 9 system/libraries/Pagination.php
  104. +9 9 system/libraries/Parser.php
  105. +13 13 system/libraries/Profiler.php
  106. +15 15 system/libraries/Session.php
  107. +4 4 system/libraries/Sha1.php
  108. +6 6 system/libraries/Table.php
  109. +8 8 system/libraries/Trackback.php
  110. +18 18 system/libraries/Typography.php
  111. +1 1  system/libraries/Unit_test.php
  112. +14 14 system/libraries/Upload.php
  113. +1 1  system/libraries/User_agent.php
  114. +45 45 system/libraries/Xmlrpc.php
  115. +22 22 system/libraries/Xmlrpcs.php
  116. +6 6 system/libraries/Zip.php
  117. +109 109 system/libraries/javascript/Jquery.php
  118. +59 59 user_guide/changelog.html
  119. +34 34 user_guide/database/active_record.html
  120. +17 17 user_guide/database/caching.html
  121. +4 4 user_guide/database/call_function.html
  122. +9 9 user_guide/database/configuration.html
  123. +3 3 user_guide/database/connecting.html
  124. +6 6 user_guide/database/examples.html
  125. +2 2 user_guide/database/fields.html
  126. +5 5 user_guide/database/forge.html
  127. +6 6 user_guide/database/helpers.html
  128. +1 1  user_guide/database/index.html
  129. +7 7 user_guide/database/queries.html
  130. +10 10 user_guide/database/results.html
  131. +3 3 user_guide/database/table_data.html
  132. +7 7 user_guide/database/transactions.html
  133. +9 9 user_guide/database/utilities.html
  134. +1 1  user_guide/doc_style/template.html
  135. +8 8 user_guide/general/alternative_php.html
  136. +1 1  user_guide/general/autoloader.html
  137. +4 4 user_guide/general/caching.html
  138. +3 3 user_guide/general/common_functions.html
  139. +16 16 user_guide/general/controllers.html
  140. +2 2 user_guide/general/core_classes.html
  141. +13 13 user_guide/general/creating_libraries.html
  142. +1 1  user_guide/general/credits.html
  143. +3 3 user_guide/general/drivers.html
  144. +20 20 user_guide/general/environments.html
  145. +9 9 user_guide/general/errors.html
  146. +13 13 user_guide/general/helpers.html
  147. +8 8 user_guide/general/hooks.html
  148. +1 1  user_guide/general/libraries.html
  149. +4 4 user_guide/general/managing_apps.html
  150. +9 9 user_guide/general/models.html
  151. +1 1  user_guide/general/profiling.html
  152. +2 2 user_guide/general/reserved_names.html
  153. +6 6 user_guide/general/routing.html
  154. +13 13 user_guide/general/security.html
  155. +32 32 user_guide/general/styleguide.html
  156. +4 4 user_guide/general/urls.html
  157. +14 14 user_guide/general/views.html
  158. +6 6 user_guide/helpers/array_helper.html
  159. +4 4 user_guide/helpers/captcha_helper.html
  160. +4 4 user_guide/helpers/cookie_helper.html
  161. +16 16 user_guide/helpers/date_helper.html
  162. +2 2 user_guide/helpers/directory_helper.html
  163. +8 8 user_guide/helpers/file_helper.html
  164. +27 27 user_guide/helpers/form_helper.html
  165. +12 12 user_guide/helpers/html_helper.html
  166. +5 5 user_guide/helpers/inflector_helper.html
  167. +1 1  user_guide/helpers/language_helper.html
  168. +1 1  user_guide/helpers/number_helper.html
  169. +7 7 user_guide/helpers/security_helper.html
  170. +4 4 user_guide/helpers/smiley_helper.html
  171. +3 3 user_guide/helpers/string_helper.html
  172. +15 15 user_guide/helpers/text_helper.html
  173. +1 1  user_guide/helpers/typography_helper.html
  174. +24 24 user_guide/helpers/url_helper.html
  175. +1 1  user_guide/helpers/xml_helper.html
  176. +8 8 user_guide/installation/index.html
  177. +2 2 user_guide/installation/troubleshooting.html
  178. +4 4 user_guide/installation/upgrade_130.html
  179. +1 1  user_guide/installation/upgrade_131.html
  180. +1 1  user_guide/installation/upgrade_132.html
  181. +4 4 user_guide/installation/upgrade_133.html
  182. +3 3 user_guide/installation/upgrade_140.html
  183. +5 5 user_guide/installation/upgrade_141.html
  184. +4 4 user_guide/installation/upgrade_150.html
  185. +1 1  user_guide/installation/upgrade_152.html
  186. +3 3 user_guide/installation/upgrade_160.html
  187. +4 4 user_guide/installation/upgrade_170.html
  188. +5 5 user_guide/installation/upgrade_200.html
  189. +1 1  user_guide/installation/upgrade_202.html
  190. +6 6 user_guide/installation/upgrade_203.html
  191. +3 3 user_guide/installation/upgrade_b11.html
  192. +4 4 user_guide/libraries/benchmark.html
  193. +8 8 user_guide/libraries/caching.html
  194. +6 6 user_guide/libraries/calendar.html
  195. +23 23 user_guide/libraries/cart.html
  196. +20 20 user_guide/libraries/config.html
  197. +12 12 user_guide/libraries/email.html
  198. +17 17 user_guide/libraries/encryption.html
  199. +29 29 user_guide/libraries/file_uploading.html
  200. +47 47 user_guide/libraries/form_validation.html
  201. +18 18 user_guide/libraries/ftp.html
  202. +32 32 user_guide/libraries/image_lib.html
  203. +16 16 user_guide/libraries/input.html
  204. +13 13 user_guide/libraries/javascript.html
  205. +11 11 user_guide/libraries/language.html
  206. +20 20 user_guide/libraries/loader.html
  207. +10 10 user_guide/libraries/output.html
  208. +10 10 user_guide/libraries/pagination.html
  209. +8 8 user_guide/libraries/parser.html
  210. +4 4 user_guide/libraries/security.html
  211. +21 21 user_guide/libraries/sessions.html
  212. +14 14 user_guide/libraries/table.html
  213. +13 13 user_guide/libraries/trackback.html
  214. +2 2 user_guide/libraries/typography.html
  215. +8 8 user_guide/libraries/unit_testing.html
  216. +7 7 user_guide/libraries/uri.html
  217. +5 5 user_guide/libraries/user_agent.html
  218. +23 23 user_guide/libraries/xmlrpc.html
  219. +16 16 user_guide/libraries/zip.html
  220. +1 1  user_guide/license.html
  221. +1 1  user_guide/nav/hacks.txt
  222. +2 2 user_guide/nav/moo.fx.js
  223. +46 46 user_guide/nav/prototype.lite.js
  224. +1 1  user_guide/overview/appflow.html
  225. +6 6 user_guide/overview/at_a_glance.html
  226. +3 3 user_guide/overview/features.html
  227. +1 1  user_guide/overview/getting_started.html
  228. +3 3 user_guide/overview/goals.html
  229. +3 3 user_guide/overview/mvc.html
  230. +1 1  user_guide/userguide.css
22 application/config/autoload.php
... ... @@ -1,4 +1,4 @@
1   -<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
  1 +<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
2 2 /*
3 3 | -------------------------------------------------------------------
4 4 | AUTO-LOADER
@@ -8,7 +8,7 @@
8 8 | In order to keep the framework as light-weight as possible only the
9 9 | absolute minimal resources are loaded by default. For example,
10 10 | the database is not connected to automatically since no assumption
11   -| is made regarding whether you intend to use it. This file lets
  11 +| is made regarding whether you intend to use it. This file lets
12 12 | you globally define which systems you would like loaded with every
13 13 | request.
14 14 |
@@ -29,11 +29,11 @@
29 29
30 30 /*
31 31 | -------------------------------------------------------------------
32   -| Auto-load Packges
  32 +| Auto-load Packges
33 33 | -------------------------------------------------------------------
34 34 | Prototype:
35 35 |
36   -| $autoload['packages'] = array(APPPATH.'third_party', '/usr/local/shared');
  36 +| $autoload['packages'] = array(APPPATH.'third_party', '/usr/local/shared');
37 37 |
38 38 */
39 39
@@ -42,7 +42,7 @@
42 42
43 43 /*
44 44 | -------------------------------------------------------------------
45   -| Auto-load Libraries
  45 +| Auto-load Libraries
46 46 | -------------------------------------------------------------------
47 47 | These are the classes located in the system/libraries folder
48 48 | or in your application/libraries folder.
@@ -57,7 +57,7 @@
57 57
58 58 /*
59 59 | -------------------------------------------------------------------
60   -| Auto-load Helper Files
  60 +| Auto-load Helper Files
61 61 | -------------------------------------------------------------------
62 62 | Prototype:
63 63 |
@@ -69,14 +69,14 @@
69 69
70 70 /*
71 71 | -------------------------------------------------------------------
72   -| Auto-load Config files
  72 +| Auto-load Config files
73 73 | -------------------------------------------------------------------
74 74 | Prototype:
75 75 |
76 76 | $autoload['config'] = array('config1', 'config2');
77 77 |
78 78 | NOTE: This item is intended for use ONLY if you have created custom
79   -| config files. Otherwise, leave it blank.
  79 +| config files. Otherwise, leave it blank.
80 80 |
81 81 */
82 82
@@ -85,13 +85,13 @@
85 85
86 86 /*
87 87 | -------------------------------------------------------------------
88   -| Auto-load Language files
  88 +| Auto-load Language files
89 89 | -------------------------------------------------------------------
90 90 | Prototype:
91 91 |
92 92 | $autoload['language'] = array('lang1', 'lang2');
93 93 |
94   -| NOTE: Do not include the "_lang" part of your file. For example
  94 +| NOTE: Do not include the "_lang" part of your file. For example
95 95 | "codeigniter_lang.php" would be referenced as array('codeigniter');
96 96 |
97 97 */
@@ -101,7 +101,7 @@
101 101
102 102 /*
103 103 | -------------------------------------------------------------------
104   -| Auto-load Models
  104 +| Auto-load Models
105 105 | -------------------------------------------------------------------
106 106 | Prototype:
107 107 |
40 application/config/config.php
... ... @@ -1,4 +1,4 @@
1   -<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
  1 +<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
2 2
3 3 /*
4 4 |--------------------------------------------------------------------------
@@ -34,7 +34,7 @@
34 34 |--------------------------------------------------------------------------
35 35 |
36 36 | This item determines which server global should be used to retrieve the
37   -| URI string. The default setting of 'AUTO' works for most servers.
  37 +| URI string. The default setting of 'AUTO' works for most servers.
38 38 | If your links do not seem to work, try one of the other delicious flavors:
39 39 |
40 40 | 'AUTO' Default - auto detects
@@ -88,7 +88,7 @@
88 88 |--------------------------------------------------------------------------
89 89 |
90 90 | If you would like to use the 'hooks' feature you must enable it by
91   -| setting this variable to TRUE (boolean). See the user guide for details.
  91 +| setting this variable to TRUE (boolean). See the user guide for details.
92 92 |
93 93 */
94 94 $config['enable_hooks'] = FALSE;
@@ -100,7 +100,7 @@
100 100 |--------------------------------------------------------------------------
101 101 |
102 102 | This item allows you to set the filename/classname prefix when extending
103   -| native libraries. For more information please see the user guide:
  103 +| native libraries. For more information please see the user guide:
104 104 |
105 105 | http://codeigniter.com/user_guide/general/core_classes.html
106 106 | http://codeigniter.com/user_guide/general/creating_libraries.html
@@ -115,11 +115,11 @@
115 115 |--------------------------------------------------------------------------
116 116 |
117 117 | This lets you specify with a regular expression which characters are permitted
118   -| within your URLs. When someone tries to submit a URL with disallowed
  118 +| within your URLs. When someone tries to submit a URL with disallowed
119 119 | characters they will get a warning message.
120 120 |
121 121 | As a security measure you are STRONGLY encouraged to restrict URLs to
122   -| as few characters as possible. By default only these are allowed: a-z 0-9~%.:_-
  122 +| as few characters as possible. By default only these are allowed: a-z 0-9~%.:_-
123 123 |
124 124 | Leave blank to allow all characters -- but only if you are insane.
125 125 |
@@ -137,7 +137,7 @@
137 137 | By default CodeIgniter uses search-engine friendly segment based URLs:
138 138 | example.com/who/what/where/
139 139 |
140   -| By default CodeIgniter enables access to the $_GET array. If for some
  140 +| By default CodeIgniter enables access to the $_GET array. If for some
141 141 | reason you would like to disable it, set 'allow_get_array' to FALSE.
142 142 |
143 143 | You can optionally enable standard query string based URLs:
@@ -210,7 +210,7 @@
210 210 |--------------------------------------------------------------------------
211 211 |
212 212 | Leave this BLANK unless you would like to set something other than the default
213   -| system/cache/ folder. Use a full server path with trailing slash.
  213 +| system/cache/ folder. Use a full server path with trailing slash.
214 214 |
215 215 */
216 216 $config['cache_path'] = '';
@@ -221,7 +221,7 @@
221 221 |--------------------------------------------------------------------------
222 222 |
223 223 | If you use the Encryption class or the Session class you
224   -| MUST set an encryption key. See the user guide for info.
  224 +| MUST set an encryption key. See the user guide for info.
225 225 |
226 226 */
227 227 $config['encryption_key'] = '';
@@ -233,9 +233,9 @@
233 233 |
234 234 | 'sess_cookie_name' = the name you want for the cookie
235 235 | 'sess_expiration' = the number of SECONDS you want the session to last.
236   -| by default sessions last 7200 seconds (two hours). Set to zero for no expiration.
  236 +| by default sessions last 7200 seconds (two hours). Set to zero for no expiration.
237 237 | 'sess_expire_on_close' = Whether to cause the session to expire automatically
238   -| when the browser window is closed
  238 +| when the browser window is closed
239 239 | 'sess_encrypt_cookie' = Whether to encrypt the cookie
240 240 | 'sess_use_database' = Whether to save the session data to a database
241 241 | 'sess_table_name' = The name of the session database table
@@ -261,8 +261,8 @@
261 261 |
262 262 | 'cookie_prefix' = Set a prefix if you need to avoid collisions
263 263 | 'cookie_domain' = Set to .your-domain.com for site-wide cookies
264   -| 'cookie_path' = Typically will be a forward slash
265   -| 'cookie_secure' = Cookies will only be set if a secure HTTPS connection exists.
  264 +| 'cookie_path' = Typically will be a forward slash
  265 +| 'cookie_secure' = Cookies will only be set if a secure HTTPS connection exists.
266 266 |
267 267 */
268 268 $config['cookie_prefix'] = "";
@@ -303,16 +303,16 @@
303 303 | Output Compression
304 304 |--------------------------------------------------------------------------
305 305 |
306   -| Enables Gzip output compression for faster page loads. When enabled,
  306 +| Enables Gzip output compression for faster page loads. When enabled,
307 307 | the output class will test whether your server supports Gzip.
308 308 | Even if it does, however, not all browsers support compression
309 309 | so enable only if you are reasonably sure your visitors can handle it.
310 310 |
311   -| VERY IMPORTANT: If you are getting a blank page when compression is enabled it
  311 +| VERY IMPORTANT: If you are getting a blank page when compression is enabled it
312 312 | means you are prematurely outputting something to your browser. It could
313   -| even be a line of whitespace at the end of one of your scripts. For
  313 +| even be a line of whitespace at the end of one of your scripts. For
314 314 | compression to work, nothing can be sent before the output buffer is called
315   -| by the output class. Do not 'echo' any values with compression enabled.
  315 +| by the output class. Do not 'echo' any values with compression enabled.
316 316 |
317 317 */
318 318 $config['compress_output'] = FALSE;
@@ -322,9 +322,9 @@
322 322 | Master Time Reference
323 323 |--------------------------------------------------------------------------
324 324 |
325   -| Options are 'local' or 'gmt'. This pref tells the system whether to use
  325 +| Options are 'local' or 'gmt'. This pref tells the system whether to use
326 326 | your server's local time as the master 'now' reference, or convert it to
327   -| GMT. See the 'date helper' page of the user guide for information
  327 +| GMT. See the 'date helper' page of the user guide for information
328 328 | regarding date handling.
329 329 |
330 330 */
@@ -338,7 +338,7 @@
338 338 |
339 339 | If your PHP installation does not have short tag support enabled CI
340 340 | can rewrite the tags on-the-fly, enabling you to utilize that syntax
341   -| in your view files. Options are TRUE or FALSE (boolean)
  341 +| in your view files. Options are TRUE or FALSE (boolean)
342 342 |
343 343 */
344 344 $config['rewrite_short_tags'] = FALSE;
6 application/config/constants.php
... ... @@ -1,4 +1,4 @@
1   -<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
  1 +<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
2 2
3 3 /*
4 4 |--------------------------------------------------------------------------
@@ -6,10 +6,10 @@
6 6 |--------------------------------------------------------------------------
7 7 |
8 8 | These prefs are used when checking and setting modes when working
9   -| with the file system. The defaults are fine on servers with proper
  9 +| with the file system. The defaults are fine on servers with proper
10 10 | security, but you may wish (or even need) to change the values in
11 11 | certain environments (Apache running a separate process for each
12   -| user, PHP under CGI with Apache suEXEC, etc.). Octal values should
  12 +| user, PHP under CGI with Apache suEXEC, etc.). Octal values should
13 13 | always be used to set the mode correctly.
14 14 |
15 15 */
10 application/config/database.php
... ... @@ -1,4 +1,4 @@
1   -<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
  1 +<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
2 2 /*
3 3 | -------------------------------------------------------------------
4 4 | DATABASE CONNECTIVITY SETTINGS
@@ -16,10 +16,10 @@
16 16 | ['username'] The username used to connect to the database
17 17 | ['password'] The password used to connect to the database
18 18 | ['database'] The name of the database you want to connect to
19   -| ['dbdriver'] The database type. ie: mysql. Currently supported:
20   -| mysql, mysqli, postgre, odbc, mssql, sqlite, oci8
  19 +| ['dbdriver'] The database type. ie: mysql. Currently supported:
  20 + mysql, mysqli, postgre, odbc, mssql, sqlite, oci8
21 21 | ['dbprefix'] You can add an optional prefix, which will be added
22   -| to the table name when using the Active Record class
  22 +| to the table name when using the Active Record class
23 23 | ['pconnect'] TRUE/FALSE - Whether to use a persistent connection
24 24 | ['db_debug'] TRUE/FALSE - Whether database errors should be displayed.
25 25 | ['cache_on'] TRUE/FALSE - Enables/disables query caching
@@ -38,7 +38,7 @@
38 38 | - good for ensuring strict SQL while developing
39 39 |
40 40 | The $active_group variable lets you choose which connection group to
41   -| make active. By default there is only one group (the 'default' group).
  41 +| make active. By default there is only one group (the 'default' group).
42 42 |
43 43 | The $active_record variables lets you determine whether or not to load
44 44 | the active record class
2  application/config/foreign_chars.php
... ... @@ -1,4 +1,4 @@
1   -<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
  1 +<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
2 2 /*
3 3 | -------------------------------------------------------------------
4 4 | Foreign Characters
4 application/config/hooks.php
... ... @@ -1,10 +1,10 @@
1   -<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
  1 +<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
2 2 /*
3 3 | -------------------------------------------------------------------------
4 4 | Hooks
5 5 | -------------------------------------------------------------------------
6 6 | This file lets you define "hooks" to extend CI without hacking the core
7   -| files. Please see the user guide for info:
  7 +| files. Please see the user guide for info:
8 8 |
9 9 | http://codeigniter.com/user_guide/general/hooks.html
10 10 |
8 application/config/mimes.php
... ... @@ -1,9 +1,9 @@
1   -<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
  1 +<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
2 2 /*
3 3 | -------------------------------------------------------------------
4 4 | MIME TYPES
5 5 | -------------------------------------------------------------------
6   -| This file contains an array of mime types. It is used by the
  6 +| This file contains an array of mime types. It is used by the
7 7 | Upload class to help identify allowed file types.
8 8 |
9 9 */
@@ -51,7 +51,7 @@
51 51 'tgz' => array('application/x-tar', 'application/x-gzip-compressed'),
52 52 'xhtml' => 'application/xhtml+xml',
53 53 'xht' => 'application/xhtml+xml',
54   - 'zip' => array('application/x-zip', 'application/zip', 'application/x-zip-compressed'),
  54 + 'zip' => array('application/x-zip', 'application/zip', 'application/x-zip-compressed'),
55 55 'mid' => 'audio/midi',
56 56 'midi' => 'audio/midi',
57 57 'mpga' => 'audio/mpeg',
@@ -71,7 +71,7 @@
71 71 'jpeg' => array('image/jpeg', 'image/pjpeg'),
72 72 'jpg' => array('image/jpeg', 'image/pjpeg'),
73 73 'jpe' => array('image/jpeg', 'image/pjpeg'),
74   - 'png' => array('image/png', 'image/x-png'),
  74 + 'png' => array('image/png', 'image/x-png'),
75 75 'tiff' => 'image/tiff',
76 76 'tif' => 'image/tiff',
77 77 'css' => 'text/css',
2  application/config/profiler.php
... ... @@ -1,4 +1,4 @@
1   -<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
  1 +<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
2 2 /*
3 3 | -------------------------------------------------------------------------
4 4 | Profiler Sections
2  application/config/routes.php
... ... @@ -1,4 +1,4 @@
1   -<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
  1 +<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
2 2 /*
3 3 | -------------------------------------------------------------------------
4 4 | URI ROUTING
4 application/config/smileys.php
... ... @@ -1,10 +1,10 @@
1   -<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
  1 +<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
2 2 /*
3 3 | -------------------------------------------------------------------
4 4 | SMILEYS
5 5 | -------------------------------------------------------------------
6 6 | This file contains an array of smileys for use with the emoticon helper.
7   -| Individual images can be used to replace multiple simileys. For example:
  7 +| Individual images can be used to replace multiple simileys. For example:
8 8 | :-) and :) use the same image replacement.
9 9 |
10 10 | Please see user guide for more info:
6 application/config/user_agents.php
... ... @@ -1,11 +1,11 @@
1   -<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
  1 +<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
2 2 /*
3 3 | -------------------------------------------------------------------
4 4 | USER AGENT TYPES
5 5 | -------------------------------------------------------------------
6   -| This file contains four arrays of user agent data. It is used by the
  6 +| This file contains four arrays of user agent data. It is used by the
7 7 | User Agent Class to help identify browser, platform, robot, and
8   -| mobile device data. The array keys are used to identify the device
  8 +| mobile device data. The array keys are used to identify the device
9 9 | and the array values are used to set the actual name of the item.
10 10 |
11 11 */
4 application/controllers/welcome.php
@@ -7,10 +7,10 @@ class Welcome extends CI_Controller {
7 7 *
8 8 * Maps to the following URL
9 9 * http://example.com/index.php/welcome
10   - * - or -
  10 + * - or -
11 11 * http://example.com/index.php/welcome/index
12 12 * - or -
13   - * Since this controller is set as the default controller in
  13 + * Since this controller is set as the default controller in
14 14 * config/routes.php, it's displayed at http://example.com/
15 15 *
16 16 * So any other public methods not prefixed with an underscore will
2  application/errors/error_php.php
@@ -3,7 +3,7 @@
3 3 <h4>A PHP Error was encountered</h4>
4 4
5 5 <p>Severity: <?php echo $severity; ?></p>
6   -<p>Message: <?php echo $message; ?></p>
  6 +<p>Message: <?php echo $message; ?></p>
7 7 <p>Filename: <?php echo $filepath; ?></p>
8 8 <p>Line Number: <?php echo $line; ?></p>
9 9
30 index.php
@@ -11,9 +11,9 @@
11 11 *
12 12 * This can be set to anything, but default usage is:
13 13 *
14   - * development
15   - * testing
16   - * production
  14 + * development
  15 + * testing
  16 + * production
17 17 *
18 18 * NOTE: If you change these, also change the error_reporting() code below
19 19 *
@@ -35,7 +35,7 @@
35 35 case 'development':
36 36 error_reporting(E_ALL);
37 37 break;
38   -
  38 +
39 39 case 'testing':
40 40 case 'production':
41 41 error_reporting(0);
@@ -52,7 +52,7 @@
52 52 *---------------------------------------------------------------
53 53 *
54 54 * This variable must contain the name of your "system" folder.
55   - * Include the path if the folder is not in the same directory
  55 + * Include the path if the folder is not in the same directory
56 56 * as this file.
57 57 *
58 58 */
@@ -65,7 +65,7 @@
65 65 *
66 66 * If you want this front controller to use a different "application"
67 67 * folder then the default one you can set its name here. The folder
68   - * can also be renamed or relocated anywhere on your server. If
  68 + * can also be renamed or relocated anywhere on your server. If
69 69 * you do, use a full server path. For more info please see the user guide:
70 70 * http://codeigniter.com/user_guide/general/managing_apps.html
71 71 *
@@ -81,24 +81,24 @@
81 81 *
82 82 * Normally you will set your default controller in the routes.php file.
83 83 * You can, however, force a custom routing by hard-coding a
84   - * specific controller class/function here. For most applications, you
  84 + * specific controller class/function here. For most applications, you
85 85 * WILL NOT set your routing here, but it's an option for those
86 86 * special instances where you might want to override the standard
87 87 * routing in a specific front controller that shares a common CI installation.
88 88 *
89   - * IMPORTANT: If you set the routing here, NO OTHER controller will be
  89 + * IMPORTANT: If you set the routing here, NO OTHER controller will be
90 90 * callable. In essence, this preference limits your application to ONE
91   - * specific controller. Leave the function name blank if you need
  91 + * specific controller. Leave the function name blank if you need
92 92 * to call functions dynamically via the URI.
93 93 *
94 94 * Un-comment the $routing array below to use this feature
95 95 *
96 96 */
97   - // The directory name, relative to the "controllers" folder. Leave blank
  97 + // The directory name, relative to the "controllers" folder. Leave blank
98 98 // if your controller is not in a sub-folder within the "controllers" folder
99 99 // $routing['directory'] = '';
100 100
101   - // The controller class file name. Example: Mycontroller
  101 + // The controller class file name. Example: Mycontroller
102 102 // $routing['controller'] = '';
103 103
104 104 // The controller function you wish to be called.
@@ -107,7 +107,7 @@
107 107
108 108 /*
109 109 * -------------------------------------------------------------------
110   - * CUSTOM CONFIG VALUES
  110 + * CUSTOM CONFIG VALUES
111 111 * -------------------------------------------------------------------
112 112 *
113 113 * The $assign_to_config array below will be passed dynamically to the
@@ -125,12 +125,12 @@
125 125
126 126
127 127 // --------------------------------------------------------------------
128   -// END OF USER CONFIGURABLE SETTINGS. DO NOT EDIT BELOW THIS LINE
  128 +// END OF USER CONFIGURABLE SETTINGS. DO NOT EDIT BELOW THIS LINE
129 129 // --------------------------------------------------------------------
130 130
131 131 /*
132 132 * ---------------------------------------------------------------
133   - * Resolve the system path for increased reliability
  133 + * Resolve the system path for increased reliability
134 134 * ---------------------------------------------------------------
135 135 */
136 136
@@ -156,7 +156,7 @@
156 156
157 157 /*
158 158 * -------------------------------------------------------------------
159   - * Now that we know the path, set the main path constants
  159 + * Now that we know the path, set the main path constants
160 160 * -------------------------------------------------------------------
161 161 */
162 162 // The name of THIS file
4 license.txt
@@ -2,7 +2,7 @@ Copyright (c) 2008 - 2011, EllisLab, Inc.
2 2 All rights reserved.
3 3
4 4 This license is a legal agreement between you and EllisLab Inc. for the use
5   -of CodeIgniter Software (the "Software"). By obtaining the Software you
  5 +of CodeIgniter Software (the "Software"). By obtaining the Software you
6 6 agree to comply with the terms and conditions of this license.
7 7
8 8 PERMITTED USE
@@ -48,4 +48,4 @@ FOR CLAIMS, DAMAGES OR OTHER LIABILITY ARISING FROM, OUT OF, OR IN CONNECTION
48 48 WITH THE SOFTWARE. LICENSE HOLDERS ARE SOLELY RESPONSIBLE FOR DETERMINING THE
49 49 APPROPRIATENESS OF USE AND ASSUME ALL RISKS ASSOCIATED WITH ITS USE, INCLUDING
50 50 BUT NOT LIMITED TO THE RISKS OF PROGRAM ERRORS, DAMAGE TO EQUIPMENT, LOSS OF
51   -DATA OR SOFTWARE PROGRAMS, OR UNAVAILABILITY OR INTERRUPTION OF OPERATIONS.
  51 +DATA OR SOFTWARE PROGRAMS, OR UNAVAILABILITY OR INTERRUPTION OF OPERATIONS.
4 system/core/Benchmark.php
... ... @@ -1,4 +1,4 @@
1   -<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
  1 +<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
2 2 /**
3 3 * CodeIgniter
4 4 *
@@ -19,7 +19,7 @@
19 19 * CodeIgniter Benchmark Class
20 20 *
21 21 * This class enables you to mark points and calculate the time difference
22   - * between them. Memory consumption can also be displayed.
  22 + * between them. Memory consumption can also be displayed.
23 23 *
24 24 * @package CodeIgniter
25 25 * @subpackage Libraries
68 system/core/CodeIgniter.php
... ... @@ -1,4 +1,4 @@
1   -<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
  1 +<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
2 2 /**
3 3 * CodeIgniter
4 4 *
@@ -29,28 +29,28 @@
29 29
30 30 /*
31 31 * ------------------------------------------------------
32   - * Define the CodeIgniter Version
  32 + * Define the CodeIgniter Version
33 33 * ------------------------------------------------------
34 34 */
35 35 define('CI_VERSION', '2.0.2');
36 36
37 37 /*
38 38 * ------------------------------------------------------
39   - * Define the CodeIgniter Branch (Core = TRUE, Reactor = FALSE)
  39 + * Define the CodeIgniter Branch (Core = TRUE, Reactor = FALSE)
40 40 * ------------------------------------------------------
41 41 */
42 42 define('CI_CORE', FALSE);
43 43
44 44 /*
45 45 * ------------------------------------------------------
46   - * Load the global functions
  46 + * Load the global functions
47 47 * ------------------------------------------------------
48 48 */
49 49 require(BASEPATH.'core/Common.php');
50 50
51 51 /*
52 52 * ------------------------------------------------------
53   - * Load the framework constants
  53 + * Load the framework constants
54 54 * ------------------------------------------------------
55 55 */
56 56 if (defined('ENVIRONMENT') AND file_exists(APPPATH.'config/'.ENVIRONMENT.'/constants.php'))
@@ -64,7 +64,7 @@
64 64
65 65 /*
66 66 * ------------------------------------------------------
67   - * Define a custom error handler so we can log PHP errors
  67 + * Define a custom error handler so we can log PHP errors
68 68 * ------------------------------------------------------
69 69 */
70 70 set_error_handler('_exception_handler');
@@ -76,7 +76,7 @@
76 76
77 77 /*
78 78 * ------------------------------------------------------
79   - * Set the subclass_prefix
  79 + * Set the subclass_prefix
80 80 * ------------------------------------------------------
81 81 *
82 82 * Normally the "subclass_prefix" is set in the config file.
@@ -85,7 +85,7 @@
85 85 * "libraries" folder. Since CI allows config items to be
86 86 * overriden via data set in the main index. php file,
87 87 * before proceeding we need to know if a subclass_prefix
88   - * override exists. If so, we will set this value now,
  88 + * override exists. If so, we will set this value now,
89 89 * before any classes are loaded
90 90 * Note: Since the config file data is cached it doesn't
91 91 * hurt to load it here.
@@ -97,7 +97,7 @@
97 97
98 98 /*
99 99 * ------------------------------------------------------
100   - * Set a liberal script execution time limit
  100 + * Set a liberal script execution time limit
101 101 * ------------------------------------------------------
102 102 */
103 103 if (function_exists("set_time_limit") == TRUE AND @ini_get("safe_mode") == 0)
@@ -107,7 +107,7 @@
107 107
108 108 /*
109 109 * ------------------------------------------------------
110   - * Start the timer... tick tock tick tock...
  110 + * Start the timer... tick tock tick tock...
111 111 * ------------------------------------------------------
112 112 */
113 113 $BM =& load_class('Benchmark', 'core');
@@ -116,21 +116,21 @@
116 116
117 117 /*
118 118 * ------------------------------------------------------
119   - * Instantiate the hooks class
  119 + * Instantiate the hooks class
120 120 * ------------------------------------------------------
121 121 */
122 122 $EXT =& load_class('Hooks', 'core');
123 123
124 124 /*
125 125 * ------------------------------------------------------
126   - * Is there a "pre_system" hook?
  126 + * Is there a "pre_system" hook?
127 127 * ------------------------------------------------------
128 128 */
129 129 $EXT->_call_hook('pre_system');
130 130
131 131 /*
132 132 * ------------------------------------------------------
133   - * Instantiate the config class
  133 + * Instantiate the config class
134 134 * ------------------------------------------------------
135 135 */
136 136 $CFG =& load_class('Config', 'core');
@@ -143,7 +143,7 @@
143 143
144 144 /*
145 145 * ------------------------------------------------------
146   - * Instantiate the UTF-8 class
  146 + * Instantiate the UTF-8 class
147 147 * ------------------------------------------------------
148 148 *
149 149 * Note: Order here is rather important as the UTF-8
@@ -157,14 +157,14 @@
157 157
158 158 /*
159 159 * ------------------------------------------------------
160   - * Instantiate the URI class
  160 + * Instantiate the URI class
161 161 * ------------------------------------------------------
162 162 */
163 163 $URI =& load_class('URI', 'core');
164 164
165 165 /*
166 166 * ------------------------------------------------------
167   - * Instantiate the routing class and set the routing
  167 + * Instantiate the routing class and set the routing
168 168 * ------------------------------------------------------
169 169 */
170 170 $RTR =& load_class('Router', 'core');
@@ -178,14 +178,14 @@
178 178
179 179 /*
180 180 * ------------------------------------------------------
181   - * Instantiate the output class
  181 + * Instantiate the output class
182 182 * ------------------------------------------------------
183 183 */
184 184 $OUT =& load_class('Output', 'core');
185 185
186 186 /*
187 187 * ------------------------------------------------------
188   - * Is there a valid cache file? If so, we're done...
  188 + * Is there a valid cache file? If so, we're done...
189 189 * ------------------------------------------------------
190 190 */
191 191 if ($EXT->_call_hook('cache_override') === FALSE)
@@ -205,21 +205,21 @@
205 205
206 206 /*
207 207 * ------------------------------------------------------
208   - * Load the Input class and sanitize globals
  208 + * Load the Input class and sanitize globals
209 209 * ------------------------------------------------------
210 210 */
211 211 $IN =& load_class('Input', 'core');
212 212
213 213 /*
214 214 * ------------------------------------------------------
215   - * Load the Language class
  215 + * Load the Language class
216 216 * ------------------------------------------------------
217 217 */
218 218 $LANG =& load_class('Lang', 'core');
219 219
220 220 /*
221 221 * ------------------------------------------------------
222   - * Load the app controller and local controller
  222 + * Load the app controller and local controller
223 223 * ------------------------------------------------------
224 224 *
225 225 */
@@ -252,14 +252,14 @@ function &get_instance()
252 252
253 253 /*
254 254 * ------------------------------------------------------
255   - * Security check
  255 + * Security check
256 256 * ------------------------------------------------------
257 257 *
258   - * None of the functions in the app controller or the
259   - * loader class can be called via the URI, nor can
260   - * controller functions that begin with an underscore
  258 + * None of the functions in the app controller or the
  259 + * loader class can be called via the URI, nor can
  260 + * controller functions that begin with an underscore
261 261 */
262   - $class = $RTR->fetch_class();
  262 + $class = $RTR->fetch_class();
263 263 $method = $RTR->fetch_method();
264 264
265 265 if ( ! class_exists($class)
@@ -272,14 +272,14 @@ function &get_instance()
272 272
273 273 /*
274 274 * ------------------------------------------------------
275   - * Is there a "pre_controller" hook?
  275 + * Is there a "pre_controller" hook?
276 276 * ------------------------------------------------------
277 277 */
278 278 $EXT->_call_hook('pre_controller');
279 279
280 280 /*
281 281 * ------------------------------------------------------
282   - * Instantiate the requested controller
  282 + * Instantiate the requested controller
283 283 * ------------------------------------------------------
284 284 */
285 285 // Mark a start point so we can benchmark the controller
@@ -289,14 +289,14 @@ function &get_instance()
289 289
290 290 /*
291 291 * ------------------------------------------------------
292   - * Is there a "post_controller_constructor" hook?
  292 + * Is there a "post_controller_constructor" hook?
293 293 * ------------------------------------------------------
294 294 */
295 295 $EXT->_call_hook('post_controller_constructor');
296 296
297 297 /*
298 298 * ------------------------------------------------------
299   - * Call the requested method
  299 + * Call the requested method
300 300 * ------------------------------------------------------
301 301 */
302 302 // Is there a "remap" function? If so, we call it instead
@@ -345,14 +345,14 @@ function &get_instance()
345 345
346 346 /*
347 347 * ------------------------------------------------------
348   - * Is there a "post_controller" hook?
  348 + * Is there a "post_controller" hook?
349 349 * ------------------------------------------------------
350 350 */
351 351 $EXT->_call_hook('post_controller');
352 352
353 353 /*
354 354 * ------------------------------------------------------
355   - * Send the final rendered output to the browser
  355 + * Send the final rendered output to the browser
356 356 * ------------------------------------------------------
357 357 */
358 358 if ($EXT->_call_hook('display_override') === FALSE)
@@ -362,14 +362,14 @@ function &get_instance()
362 362
363 363 /*
364 364 * ------------------------------------------------------
365   - * Is there a "post_system" hook?
  365 + * Is there a "post_system" hook?
366 366 * ------------------------------------------------------
367 367 */
368 368 $EXT->_call_hook('post_system');
369 369
370 370 /*
371 371 * ------------------------------------------------------
372   - * Close the DB connection if one exists
  372 + * Close the DB connection if one exists
373 373 * ------------------------------------------------------
374 374 */
375 375 if (class_exists('CI_DB') AND isset($CI->db))
28 system/core/Common.php
... ... @@ -1,4 +1,4 @@
1   -<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
  1 +<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
2 2 /**
3 3 * CodeIgniter
4 4 *
@@ -58,7 +58,7 @@ function is_php($version = '5.0.0')
58 58 * Tests for file writability
59 59 *
60 60 * is_writable() returns TRUE on Windows servers when you really can't write to
61   - * the file, based on the read-only attribute. is_writable() is also unreliable
  61 + * the file, based on the read-only attribute. is_writable() is also unreliable
62 62 * on Unix servers if safe_mode is on.
63 63 *
64 64 * @access private
@@ -73,7 +73,7 @@ function is_really_writable($file)
73 73 }
74 74
75 75 // For windows servers and safe_mode "on" installations we'll actually
76   - // write a file then read it. Bah...
  76 + // write a file then read it. Bah...
77 77 if (is_dir($file))
78 78 {
79 79 $file = rtrim($file, '/').'/'.md5(mt_rand(1,100).mt_rand(1,100));
@@ -102,8 +102,8 @@ function is_really_writable($file)
102 102 /**
103 103 * Class registry
104 104 *
105   -* This function acts as a singleton. If the requested class does not
106   -* exist it is instantiated and set to a static variable. If it has
  105 +* This function acts as a singleton. If the requested class does not
  106 +* exist it is instantiated and set to a static variable. If it has
107 107 * previously been instantiated the variable is returned.
108 108 *
109 109 * @access public
@@ -116,7 +116,7 @@ function &load_class($class, $directory = 'libraries', $prefix = 'CI_')
116 116 {
117 117 static $_classes = array();
118 118
119   - // Does the class exist? If so, we're done...
  119 + // Does the class exist? If so, we're done...
120 120 if (isset($_classes[$class]))
121 121 {
122 122 return $_classes[$class];
@@ -141,7 +141,7 @@ function &load_class($class, $directory = 'libraries', $prefix = 'CI_')
141 141 }
142 142 }
143 143
144   - // Is the request a class extension? If so we load it too
  144 + // Is the request a class extension? If so we load it too
145 145 if (file_exists(APPPATH.$directory.'/'.config_item('subclass_prefix').$class.'.php'))
146 146 {
147 147 $name = config_item('subclass_prefix').$class;
@@ -170,7 +170,7 @@ function &load_class($class, $directory = 'libraries', $prefix = 'CI_')
170 170 // --------------------------------------------------------------------
171 171
172 172 /**
173   -* Keeps track of which libraries have been loaded. This function is
  173 +* Keeps track of which libraries have been loaded. This function is
174 174 * called by the load_class() function above
175 175 *
176 176 * @access public
@@ -399,7 +399,7 @@ function set_status_header($code = 200, $text = '')
399 399
400 400 if ($text == '')
401 401 {
402   - show_error('No status text available. Please check your status code number or supply your own message text.', 500);
  402 + show_error('No status text available. Please check your status code number or supply your own message text.', 500);
403 403 }
404 404
405 405 $server_protocol = (isset($_SERVER['SERVER_PROTOCOL'])) ? $_SERVER['SERVER_PROTOCOL'] : FALSE;
@@ -424,7 +424,7 @@ function set_status_header($code = 200, $text = '')
424 424 * Exception Handler
425 425 *
426 426 * This is the custom exception handler that is declaired at the top
427   -* of Codeigniter.php. The main reason we use this is to permit
  427 +* of Codeigniter.php. The main reason we use this is to permit
428 428 * PHP errors to be logged in our own log files since the user may
429 429 * not have access to server logs. Since this function
430 430 * effectively intercepts PHP errors, however, we also need
@@ -455,7 +455,7 @@ function _exception_handler($severity, $message, $filepath, $line)
455 455 $_error->show_php_error($severity, $message, $filepath, $line);
456 456 }
457 457
458   - // Should we log the error? No? We're done...
  458 + // Should we log the error? No? We're done...
459 459 if (config_item('log_threshold') == 0)
460 460 {
461 461 return;
@@ -479,16 +479,16 @@ function _exception_handler($severity, $message, $filepath, $line)
479 479 function remove_invisible_characters($str, $url_encoded = TRUE)
480 480 {
481 481 $non_displayables = array();
482   -
  482 +
483 483 // every control character except newline (dec 10)
484 484 // carriage return (dec 13), and horizontal tab (dec 09)
485   -
  485 +
486 486 if ($url_encoded)
487 487 {
488 488 $non_displayables[] = '/%0[0-8bcef]/'; // url encoded 00-08, 11, 12, 14, 15
489 489 $non_displayables[] = '/%1[0-9a-f]/'; // url encoded 16-31
490 490 }
491   -
  491 +
492 492 $non_displayables[] = '/[\x00-\x08\x0B\x0C\x0E-\x1F\x7F]+/S'; // 00-08, 11, 12, 14-31, 127
493 493
494 494 do
18 system/core/Config.php
... ... @@ -1,4 +1,4 @@
1   -<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
  1 +<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
2 2 /**
3 3 * CodeIgniter
4 4 *
@@ -37,11 +37,11 @@ class CI_Config {
37 37 *
38 38 * Sets the $config data from the primary config.php file as a class variable
39 39 *
40   - * @access public
41   - * @param string the config file name
42   - * @param boolean if configuration values should be loaded into their own section
43   - * @param boolean true if errors should just return false, false if an error message should be displayed
44   - * @return boolean if the file was successfully loaded or not
  40 + * @access public
  41 + * @param string the config file name
  42 + * @param boolean if configuration values should be loaded into their own section
  43 + * @param boolean true if errors should just return false, false if an error message should be displayed
  44 + * @return boolean if the file was successfully loaded or not
45 45 */
46 46 function __construct()
47 47 {
@@ -74,8 +74,8 @@ function __construct()
74 74 *
75 75 * @access public
76 76 * @param string the config file name
77   - * @param boolean if configuration values should be loaded into their own section
78   - * @param boolean true if errors should just return false, false if an error message should be displayed
  77 + * @param boolean if configuration values should be loaded into their own section
  78 + * @param boolean true if errors should just return false, false if an error message should be displayed
79 79 * @return boolean if the file was loaded correctly
80 80 */
81 81 function load($file = '', $use_sections = FALSE, $fail_gracefully = FALSE)
@@ -305,7 +305,7 @@ function set_item($item, $value)
305 305 * Assign to Config
306 306 *
307 307 * This function is called by the front controller (CodeIgniter.php)
308   - * after the Config class is instantiated. It permits config items
  308 + * after the Config class is instantiated. It permits config items
309 309 * to be assigned or overriden by variables contained in the index.php file
310 310 *
311 311 * @access private
6 system/core/Controller.php
... ... @@ -1,4 +1,4 @@
1   -<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
  1 +<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
2 2 /**
3 3 * CodeIgniter
4 4 *
@@ -37,7 +37,7 @@ class CI_Controller {
37 37 public function __construct()
38 38 {
39 39 self::$instance =& $this;
40   -
  40 +
41 41