Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

hand merged remaining unresolved files following the backout of 648b4…

…2a75739, which was a NON-trivial whitespace commit
  • Loading branch information...
commit 8f371a4954ec84f9ea80c26e654a4793714f8a07 2 parents 806b824 + 4b9c629
@derekjones derekjones authored
Showing with 2,045 additions and 2,046 deletions.
  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. +15 −15 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. +58 −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. +12 −12 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. +1 −1  user_guide/helpers/xml_helper.html
  175. +8 −8 user_guide/installation/index.html
  176. +2 −2 user_guide/installation/troubleshooting.html
  177. +4 −4 user_guide/installation/upgrade_130.html
  178. +1 −1  user_guide/installation/upgrade_131.html
  179. +1 −1  user_guide/installation/upgrade_132.html
  180. +4 −4 user_guide/installation/upgrade_133.html
  181. +3 −3 user_guide/installation/upgrade_140.html
  182. +5 −5 user_guide/installation/upgrade_141.html
  183. +4 −4 user_guide/installation/upgrade_150.html
  184. +1 −1  user_guide/installation/upgrade_152.html
  185. +3 −3 user_guide/installation/upgrade_160.html
  186. +4 −4 user_guide/installation/upgrade_170.html
  187. +5 −5 user_guide/installation/upgrade_200.html
  188. +1 −1  user_guide/installation/upgrade_202.html
  189. +6 −6 user_guide/installation/upgrade_203.html
  190. +3 −3 user_guide/installation/upgrade_b11.html
  191. +4 −4 user_guide/libraries/benchmark.html
  192. +8 −8 user_guide/libraries/caching.html
  193. +6 −6 user_guide/libraries/calendar.html
  194. +23 −23 user_guide/libraries/cart.html
  195. +20 −20 user_guide/libraries/config.html
  196. +12 −12 user_guide/libraries/email.html
  197. +17 −17 user_guide/libraries/encryption.html
  198. +29 −29 user_guide/libraries/file_uploading.html
  199. +47 −47 user_guide/libraries/form_validation.html
  200. +18 −18 user_guide/libraries/ftp.html
  201. +32 −32 user_guide/libraries/image_lib.html
  202. +16 −16 user_guide/libraries/input.html
  203. +13 −13 user_guide/libraries/javascript.html
  204. +11 −11 user_guide/libraries/language.html
  205. +20 −20 user_guide/libraries/loader.html
  206. +10 −10 user_guide/libraries/output.html
  207. +10 −10 user_guide/libraries/pagination.html
  208. +8 −8 user_guide/libraries/parser.html
  209. +4 −4 user_guide/libraries/security.html
  210. +20 −20 user_guide/libraries/sessions.html
  211. +14 −14 user_guide/libraries/table.html
  212. +13 −13 user_guide/libraries/trackback.html
  213. +2 −2 user_guide/libraries/typography.html
  214. +8 −8 user_guide/libraries/unit_testing.html
  215. +7 −7 user_guide/libraries/uri.html
  216. +5 −5 user_guide/libraries/user_agent.html
  217. +23 −23 user_guide/libraries/xmlrpc.html
  218. +16 −16 user_guide/libraries/zip.html
  219. +1 −1  user_guide/license.html
  220. +1 −1  user_guide/nav/hacks.txt
  221. +2 −2 user_guide/nav/moo.fx.js
  222. +46 −46 user_guide/nav/prototype.lite.js
  223. +1 −1  user_guide/overview/appflow.html
  224. +6 −6 user_guide/overview/at_a_glance.html
  225. +3 −3 user_guide/overview/features.html
  226. +1 −1  user_guide/overview/getting_started.html
  227. +3 −3 user_guide/overview/goals.html
  228. +3 −3 user_guide/overview/mvc.html
  229. +1 −1  user_guide/userguide.css
View
22 application/config/autoload.php
@@ -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,11 +29,11 @@
/*
| -------------------------------------------------------------------
-| 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');
|
*/
@@ -42,7 +42,7 @@
/*
| -------------------------------------------------------------------
-| 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:
|
View
40 application/config/config.php
@@ -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;
View
6 application/config/constants.php
@@ -1,4 +1,4 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
/*
|--------------------------------------------------------------------------
@@ -6,10 +6,10 @@
|--------------------------------------------------------------------------
|
| 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.
|
*/
View
10 application/config/database.php
@@ -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,10 +16,10 @@
| ['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
@@ -38,7 +38,7 @@
| - 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
View
2  application/config/foreign_chars.php
@@ -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
View
4 application/config/hooks.php
@@ -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
|
View
8 application/config/mimes.php
@@ -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',
View
2  application/config/profiler.php
@@ -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
View
2  application/config/routes.php
@@ -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
View
4 application/config/smileys.php
@@ -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:
View
6 application/config/user_agents.php
@@ -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.
|
*/
View
4 application/controllers/welcome.php
@@ -7,10 +7,10 @@ class Welcome extends CI_Controller {
*
* Maps to the following URL
* http://example.com/index.php/welcome
- * - or -
+ * - or -
* http://example.com/index.php/welcome/index
* - or -
- * Since this controller is set as the default controller in
+ * Since this controller is set as the default controller in
* config/routes.php, it's displayed at http://example.com/
*
* So any other public methods not prefixed with an underscore will
View
2  application/errors/error_php.php
@@ -3,7 +3,7 @@
<h4>A PHP Error was encountered</h4>
<p>Severity: <?php echo $severity; ?></p>
-<p>Message: <?php echo $message; ?></p>
+<p>Message: <?php echo $message; ?></p>
<p>Filename: <?php echo $filepath; ?></p>
<p>Line Number: <?php echo $line; ?></p>
View
30 index.php
@@ -11,9 +11,9 @@
*
* This can be set to anything, but default usage is:
*
- * development
- * testing
- * production
+ * development
+ * testing
+ * production
*
* NOTE: If you change these, also change the error_reporting() code below
*
@@ -35,7 +35,7 @@
case 'development':
error_reporting(E_ALL);
break;
-
+
case 'testing':
case 'production':
error_reporting(0);
@@ -52,7 +52,7 @@
*---------------------------------------------------------------
*
* This variable must contain the name of your "system" folder.
- * Include the path if the folder is not in the same directory
+ * Include the path if the folder is not in the same directory
* as this file.
*
*/
@@ -65,7 +65,7 @@
*
* If you want this front controller to use a different "application"
* folder then the default one you can set its name here. The folder
- * can also be renamed or relocated anywhere on your server. If
+ * can also be renamed or relocated anywhere on your server. If
* you do, use a full server path. For more info please see the user guide:
* http://codeigniter.com/user_guide/general/managing_apps.html
*
@@ -81,24 +81,24 @@
*
* Normally you will set your default controller in the routes.php file.
* You can, however, force a custom routing by hard-coding a
- * specific controller class/function here. For most applications, you
+ * specific controller class/function here. For most applications, you
* WILL NOT set your routing here, but it's an option for those
* special instances where you might want to override the standard
* routing in a specific front controller that shares a common CI installation.
*
- * IMPORTANT: If you set the routing here, NO OTHER controller will be
+ * IMPORTANT: If you set the routing here, NO OTHER controller will be
* callable. In essence, this preference limits your application to ONE
- * specific controller. Leave the function name blank if you need
+ * specific controller. Leave the function name blank if you need
* to call functions dynamically via the URI.
*
* Un-comment the $routing array below to use this feature
*
*/
- // The directory name, relative to the "controllers" folder. Leave blank
+ // The directory name, relative to the "controllers" folder. Leave blank
// if your controller is not in a sub-folder within the "controllers" folder
// $routing['directory'] = '';
- // The controller class file name. Example: Mycontroller
+ // The controller class file name. Example: Mycontroller
// $routing['controller'] = '';
// The controller function you wish to be called.
@@ -107,7 +107,7 @@
/*
* -------------------------------------------------------------------
- * CUSTOM CONFIG VALUES
+ * CUSTOM CONFIG VALUES
* -------------------------------------------------------------------
*
* The $assign_to_config array below will be passed dynamically to the
@@ -125,12 +125,12 @@
// --------------------------------------------------------------------
-// END OF USER CONFIGURABLE SETTINGS. DO NOT EDIT BELOW THIS LINE
+// END OF USER CONFIGURABLE SETTINGS. DO NOT EDIT BELOW THIS LINE
// --------------------------------------------------------------------
/*
* ---------------------------------------------------------------
- * Resolve the system path for increased reliability
+ * Resolve the system path for increased reliability
* ---------------------------------------------------------------
*/
@@ -156,7 +156,7 @@
/*
* -------------------------------------------------------------------
- * Now that we know the path, set the main path constants
+ * Now that we know the path, set the main path constants
* -------------------------------------------------------------------
*/
// The name of THIS file
View
4 license.txt
@@ -2,7 +2,7 @@ Copyright (c) 2008 - 2011, EllisLab, Inc.
All rights reserved.
This license is a legal agreement between you and EllisLab Inc. for the use
-of CodeIgniter Software (the "Software"). By obtaining the Software you
+of CodeIgniter Software (the "Software"). By obtaining the Software you
agree to comply with the terms and conditions of this license.
PERMITTED USE
@@ -48,4 +48,4 @@ FOR CLAIMS, DAMAGES OR OTHER LIABILITY ARISING FROM, OUT OF, OR IN CONNECTION
WITH THE SOFTWARE. LICENSE HOLDERS ARE SOLELY RESPONSIBLE FOR DETERMINING THE
APPROPRIATENESS OF USE AND ASSUME ALL RISKS ASSOCIATED WITH ITS USE, INCLUDING
BUT NOT LIMITED TO THE RISKS OF PROGRAM ERRORS, DAMAGE TO EQUIPMENT, LOSS OF
-DATA OR SOFTWARE PROGRAMS, OR UNAVAILABILITY OR INTERRUPTION OF OPERATIONS.
+DATA OR SOFTWARE PROGRAMS, OR UNAVAILABILITY OR INTERRUPTION OF OPERATIONS.
View
4 system/core/Benchmark.php
@@ -1,4 +1,4 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
/**
* CodeIgniter
*
@@ -19,7 +19,7 @@
* CodeIgniter Benchmark Class
*
* This class enables you to mark points and calculate the time difference
- * between them. Memory consumption can also be displayed.
+ * between them. Memory consumption can also be displayed.
*
* @package CodeIgniter
* @subpackage Libraries
View
68 system/core/CodeIgniter.php
@@ -1,4 +1,4 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
/**
* CodeIgniter
*
@@ -29,28 +29,28 @@
/*
* ------------------------------------------------------
- * Define the CodeIgniter Version
+ * Define the CodeIgniter Version
* ------------------------------------------------------
*/
define('CI_VERSION', '2.0.2');
/*
* ------------------------------------------------------
- * Define the CodeIgniter Branch (Core = TRUE, Reactor = FALSE)
+ * Define the CodeIgniter Branch (Core = TRUE, Reactor = FALSE)
* ------------------------------------------------------
*/
define('CI_CORE', FALSE);
/*
* ------------------------------------------------------
- * Load the global functions
+ * Load the global functions
* ------------------------------------------------------
*/
require(BASEPATH.'core/Common.php');
/*
* ------------------------------------------------------
- * Load the framework constants
+ * Load the framework constants
* ------------------------------------------------------
*/
if (defined('ENVIRONMENT') AND file_exists(APPPATH.'config/'.ENVIRONMENT.'/constants.php'))
@@ -64,7 +64,7 @@
/*
* ------------------------------------------------------
- * Define a custom error handler so we can log PHP errors
+ * Define a custom error handler so we can log PHP errors
* ------------------------------------------------------
*/
set_error_handler('_exception_handler');
@@ -76,7 +76,7 @@
/*
* ------------------------------------------------------
- * Set the subclass_prefix
+ * Set the subclass_prefix
* ------------------------------------------------------
*
* Normally the "subclass_prefix" is set in the config file.
@@ -85,7 +85,7 @@
* "libraries" folder. Since CI allows config items to be
* overriden via data set in the main index. php file,
* before proceeding we need to know if a subclass_prefix
- * override exists. If so, we will set this value now,
+ * override exists. If so, we will set this value now,
* before any classes are loaded
* Note: Since the config file data is cached it doesn't
* hurt to load it here.
@@ -97,7 +97,7 @@
/*
* ------------------------------------------------------
- * Set a liberal script execution time limit
+ * Set a liberal script execution time limit
* ------------------------------------------------------
*/
if (function_exists("set_time_limit") == TRUE AND @ini_get("safe_mode") == 0)
@@ -107,7 +107,7 @@
/*
* ------------------------------------------------------
- * Start the timer... tick tock tick tock...
+ * Start the timer... tick tock tick tock...
* ------------------------------------------------------
*/
$BM =& load_class('Benchmark', 'core');
@@ -116,21 +116,21 @@
/*
* ------------------------------------------------------
- * Instantiate the hooks class
+ * Instantiate the hooks class
* ------------------------------------------------------
*/
$EXT =& load_class('Hooks', 'core');
/*
* ------------------------------------------------------
- * Is there a "pre_system" hook?
+ * Is there a "pre_system" hook?
* ------------------------------------------------------
*/
$EXT->_call_hook('pre_system');
/*
* ------------------------------------------------------
- * Instantiate the config class
+ * Instantiate the config class
* ------------------------------------------------------
*/
$CFG =& load_class('Config', 'core');
@@ -143,7 +143,7 @@
/*
* ------------------------------------------------------
- * Instantiate the UTF-8 class
+ * Instantiate the UTF-8 class
* ------------------------------------------------------
*
* Note: Order here is rather important as the UTF-8
@@ -157,14 +157,14 @@
/*
* ------------------------------------------------------
- * Instantiate the URI class
+ * Instantiate the URI class
* ------------------------------------------------------
*/
$URI =& load_class('URI', 'core');
/*
* ------------------------------------------------------
- * Instantiate the routing class and set the routing
+ * Instantiate the routing class and set the routing
* ------------------------------------------------------
*/
$RTR =& load_class('Router', 'core');
@@ -178,14 +178,14 @@
/*
* ------------------------------------------------------
- * Instantiate the output class
+ * Instantiate the output class
* ------------------------------------------------------
*/
$OUT =& load_class('Output', 'core');
/*
* ------------------------------------------------------
- * Is there a valid cache file? If so, we're done...
+ * Is there a valid cache file? If so, we're done...
* ------------------------------------------------------
*/
if ($EXT->_call_hook('cache_override') === FALSE)
@@ -205,21 +205,21 @@
/*
* ------------------------------------------------------
- * Load the Input class and sanitize globals
+ * Load the Input class and sanitize globals
* ------------------------------------------------------
*/
$IN =& load_class('Input', 'core');
/*
* ------------------------------------------------------
- * Load the Language class
+ * Load the Language class
* ------------------------------------------------------
*/
$LANG =& load_class('Lang', 'core');
/*
* ------------------------------------------------------
- * Load the app controller and local controller
+ * Load the app controller and local controller
* ------------------------------------------------------
*
*/
@@ -252,14 +252,14 @@ function &get_instance()
/*
* ------------------------------------------------------
- * Security check
+ * Security check
* ------------------------------------------------------
*
- * None of the functions in the app controller or the
- * loader class can be called via the URI, nor can
- * controller functions that begin with an underscore
+ * None of the functions in the app controller or the
+ * loader class can be called via the URI, nor can
+ * controller functions that begin with an underscore
*/
- $class = $RTR->fetch_class();
+ $class = $RTR->fetch_class();
$method = $RTR->fetch_method();
if ( ! class_exists($class)
@@ -272,14 +272,14 @@ function &get_instance()
/*
* ------------------------------------------------------
- * Is there a "pre_controller" hook?
+ * Is there a "pre_controller" hook?
* ------------------------------------------------------
*/
$EXT->_call_hook('pre_controller');
/*
* ------------------------------------------------------
- * Instantiate the requested controller
+ * Instantiate the requested controller
* ------------------------------------------------------
*/
// Mark a start point so we can benchmark the controller
@@ -289,14 +289,14 @@ function &get_instance()
/*
* ------------------------------------------------------
- * Is there a "post_controller_constructor" hook?
+ * Is there a "post_controller_constructor" hook?
* ------------------------------------------------------
*/
$EXT->_call_hook('post_controller_constructor');
/*
* ------------------------------------------------------
- * Call the requested method
+ * Call the requested method
* ------------------------------------------------------
*/
// Is there a "remap" function? If so, we call it instead
@@ -345,14 +345,14 @@ function &get_instance()
/*
* ------------------------------------------------------
- * Is there a "post_controller" hook?
+ * Is there a "post_controller" hook?
* ------------------------------------------------------
*/
$EXT->_call_hook('post_controller');
/*
* ------------------------------------------------------
- * Send the final rendered output to the browser
+ * Send the final rendered output to the browser
* ------------------------------------------------------
*/
if ($EXT->_call_hook('display_override') === FALSE)
@@ -362,14 +362,14 @@ function &get_instance()
/*
* ------------------------------------------------------
- * Is there a "post_system" hook?
+ * Is there a "post_system" hook?
* ------------------------------------------------------
*/
$EXT->_call_hook('post_system');
/*
* ------------------------------------------------------
- * Close the DB connection if one exists
+ * Close the DB connection if one exists
* ------------------------------------------------------
*/
if (class_exists('CI_DB') AND isset($CI->db))
View
28 system/core/Common.php
@@ -1,4 +1,4 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
/**
* CodeIgniter
*
@@ -61,7 +61,7 @@ function is_php($version = '5.0.0')
* Tests for file writability
*
* is_writable() returns TRUE on Windows servers when you really can't write to
- * the file, based on the read-only attribute. is_writable() is also unreliable
+ * the file, based on the read-only attribute. is_writable() is also unreliable
* on Unix servers if safe_mode is on.
*
* @access private
@@ -78,7 +78,7 @@ function is_really_writable($file)
}
// For windows servers and safe_mode "on" installations we'll actually
- // write a file then read it. Bah...
+ // write a file then read it. Bah...
if (is_dir($file))
{
$file = rtrim($file, '/').'/'.md5(mt_rand(1,100).mt_rand(1,100));
@@ -108,8 +108,8 @@ function is_really_writable($file)
/**
* Class registry
*
-* This function acts as a singleton. If the requested class does not
-* exist it is instantiated and set to a static variable. If it has
+* This function acts as a singleton. If the requested class does not
+* exist it is instantiated and set to a static variable. If it has
* previously been instantiated the variable is returned.
*
* @access public
@@ -124,7 +124,7 @@ function &load_class($class, $directory = 'libraries', $prefix = 'CI_')
{
static $_classes = array();
- // Does the class exist? If so, we're done...
+ // Does the class exist? If so, we're done...
if (isset($_classes[$class]))
{
return $_classes[$class];
@@ -149,7 +149,7 @@ function &load_class($class, $directory = 'libraries', $prefix = 'CI_')
}
}
- // Is the request a class extension? If so we load it too
+ // Is the request a class extension? If so we load it too
if (file_exists(APPPATH.$directory.'/'.config_item('subclass_prefix').$class.'.php'))
{
$name = config_item('subclass_prefix').$class;
@@ -179,7 +179,7 @@ function &load_class($class, $directory = 'libraries', $prefix = 'CI_')
// --------------------------------------------------------------------
/**
-* Keeps track of which libraries have been loaded. This function is
+* Keeps track of which libraries have been loaded. This function is
* called by the load_class() function above
*
* @access public
@@ -428,7 +428,7 @@ function set_status_header($code = 200, $text = '')
if ($text == '')
{
- show_error('No status text available. Please check your status code number or supply your own message text.', 500);
+ show_error('No status text available. Please check your status code number or supply your own message text.', 500);
}
$server_protocol = (isset($_SERVER['SERVER_PROTOCOL'])) ? $_SERVER['SERVER_PROTOCOL'] : FALSE;
@@ -454,7 +454,7 @@ function set_status_header($code = 200, $text = '')
* Exception Handler
*
* This is the custom exception handler that is declaired at the top
-* of Codeigniter.php. The main reason we use this is to permit
+* of Codeigniter.php. The main reason we use this is to permit
* PHP errors to be logged in our own log files since the user may
* not have access to server logs. Since this function
* effectively intercepts PHP errors, however, we also need
@@ -487,7 +487,7 @@ function _exception_handler($severity, $message, $filepath, $line)
$_error->show_php_error($severity, $message, $filepath, $line);
}
- // Should we log the error? No? We're done...
+ // Should we log the error? No? We're done...
if (config_item('log_threshold') == 0)
{
return;
@@ -514,16 +514,16 @@ function _exception_handler($severity, $message, $filepath, $line)
function remove_invisible_characters($str, $url_encoded = TRUE)
{
$non_displayables = array();
-
+
// every control character except newline (dec 10)
// carriage return (dec 13), and horizontal tab (dec 09)
-
+
if ($url_encoded)
{
$non_displayables[] = '/%0[0-8bcef]/'; // url encoded 00-08, 11, 12, 14, 15
$non_displayables[] = '/%1[0-9a-f]/'; // url encoded 16-31
}
-
+
$non_displayables[] = '/[\x00-\x08\x0B\x0C\x0E-\x1F\x7F]+/S'; // 00-08, 11, 12, 14-31, 127
do
View
18 system/core/Config.php
@@ -1,4 +1,4 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
/**
* CodeIgniter
*
@@ -37,11 +37,11 @@ class CI_Config {
*
* Sets the $config data from the primary config.php file as a class variable
*
- * @access public
- * @param string the config file name
- * @param boolean if configuration values should be loaded into their own section
- * @param boolean true if errors should just return false, false if an error message should be displayed
- * @return boolean if the file was successfully loaded or not
+ * @access public
+ * @param string the config file name
+ * @param boolean if configuration values should be loaded into their own section
+ * @param boolean true if errors should just return false, false if an error message should be displayed
+ * @return boolean if the file was successfully loaded or not
*/
function __construct()
{
@@ -74,8 +74,8 @@ function __construct()
*
* @access public
* @param string the config file name
- * @param boolean if configuration values should be loaded into their own section
- * @param boolean true if errors should just return false, false if an error message should be displayed
+ * @param boolean if configuration values should be loaded into their own section
+ * @param boolean true if errors should just return false, false if an error message should be displayed
* @return boolean if the file was loaded correctly
*/
function load($file = '', $use_sections = FALSE, $fail_gracefully = FALSE)
@@ -339,7 +339,7 @@ function set_item($item, $value)
* Assign to Config
*
* This function is called by the front controller (CodeIgniter.php)
- * after the Config class is instantiated. It permits config items
+ * after the Config class is instantiated. It permits config items
* to be assigned or overriden by variables contained in the index.php file
*
* @access private
View
6 system/core/Controller.php
@@ -1,4 +1,4 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
/**
* CodeIgniter
*
@@ -37,7 +37,7 @@ class CI_Controller {
public function __construct()
{
self::$instance =& $this;
-
+
// Assign all the class objects that were instantiated by the
// bootstrap file (CodeIgniter.php) to local class variables
// so that CI can run as one big super object.
@@ -49,7 +49,7 @@ public function __construct()
$this->load =& load_class('Loader', 'core');
$this->load->set_base_classes()->ci_autoloader();
-
+
log_message('debug', "Controller Class Initialized");
}
View
6 system/core/Exceptions.php
@@ -1,4 +1,4 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
/**
* CodeIgniter
*
@@ -54,7 +54,7 @@ class CI_Exceptions {
public function __construct()
{
$this->ob_level = ob_get_level();
- // Note: Do not log messages from this constructor.
+ // Note: Do not log messages from this constructor.
}
// --------------------------------------------------------------------
@@ -75,7 +75,7 @@ function log_exception($severity, $message, $filepath, $line)
{
$severity = ( ! isset($this->levels[$severity])) ? $severity : $this->levels[$severity];
- log_message('error', 'Severity: '.$severity.' --> '.$message. ' '.$filepath.' '.$line, TRUE);
+ log_message('error', 'Severity: '.$severity.' --> '.$message. ' '.$filepath.' '.$line, TRUE);
}
// --------------------------------------------------------------------
View
4 system/core/Hooks.php
@@ -1,4 +1,4 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
/**
* CodeIgniter
*
@@ -67,7 +67,7 @@ function _initialize()
if (defined('ENVIRONMENT') AND is_file(APPPATH.'config/'.ENVIRONMENT.'/hooks.php'))
{
- include(APPPATH.'config/'.ENVIRONMENT.'/hooks.php');
+ include(APPPATH.'config/'.ENVIRONMENT.'/hooks.php');
}
elseif (is_file(APPPATH.'config/hooks.php'))
{
View
24 system/core/Input.php
@@ -1,4 +1,4 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
/**
* CodeIgniter
*
@@ -36,7 +36,7 @@ class CI_Input {
var $_enable_csrf = FALSE; // Set automatically based on config setting
protected $headers = array();
-
+
/**
* Constructor
@@ -147,7 +147,7 @@ function post($index = NULL, $xss_clean = FALSE)
}
return $post;
}
-
+
return $this->_fetch_from_array($_POST, $index, $xss_clean);
}
@@ -201,7 +201,7 @@ function cookie($index = '', $xss_clean = FALSE)
* @param mixed
* @param string the value of the cookie
* @param string the number of seconds until expiration
- * @param string the cookie domain. Usually: .yourdomain.com
+ * @param string the cookie domain. Usually: .yourdomain.com
* @param string the cookie path
* @param string the cookie prefix
* @param bool true makes the cookie secure
@@ -402,9 +402,9 @@ function user_agent()
function _sanitize_globals()
{
// It would be "wrong" to unset any of these GLOBALS.
- $protected = array('_SERVER', '_GET', '_POST', '_FILES', '_REQUEST',
+ $protected = array('_SERVER', '_GET', '_POST', '_FILES', '_REQUEST',
'_SESSION', '_ENV', 'GLOBALS', 'HTTP_RAW_POST_DATA',
- 'system_folder', 'application_folder', 'BM', 'EXT',
+ 'system_folder', 'application_folder', 'BM', 'EXT',
'CFG', 'URI', 'RTR', 'OUT', 'IN');
// Unset globals for securiy.
@@ -523,7 +523,7 @@ function _clean_input_data($str)
{
$str = $this->uni->clean_string($str);
}
-
+
// Remove control characters
$str = remove_invisible_characters($str);
@@ -579,7 +579,7 @@ function _clean_input_keys($str)
/**
* Request Headers
*
- * In Apache, you can simply call apache_request_headers(), however for
+ * In Apache, you can simply call apache_request_headers(), however for
* people running other webservers the function is undefined.
*
* @return array
@@ -609,10 +609,10 @@ public function request_headers($xss_clean = FALSE)
{
$key = str_replace('_', ' ', strtolower($key));
$key = str_replace(' ', '-', ucwords($key));
-
+
$this->headers[$key] = $val;
}
-
+
return $this->headers;
}
@@ -633,7 +633,7 @@ public function get_request_header($index, $xss_clean = FALSE)
{
$this->request_headers();
}
-
+
if ( ! isset($this->headers[$index]))
{
return FALSE;
@@ -644,7 +644,7 @@ public function get_request_header($index, $xss_clean = FALSE)
return $this->security->xss_clean($this->headers[$index]);
}
- return $this->headers[$index];
+ return $this->headers[$index];
}
// --------------------------------------------------------------------
View
2  system/core/Lang.php
@@ -1,4 +1,4 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
/**
* CodeIgniter
*
View
60 system/core/Loader.php
@@ -1,4 +1,4 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
/**
* CodeIgniter
*
@@ -40,7 +40,7 @@ class CI_Loader {
protected $_ci_loaded_files = array();
protected $_ci_models = array();
protected $_ci_helpers = array();
- protected $_ci_varmap = array('unit_test' => 'unit',
+ protected $_ci_varmap = array('unit_test' => 'unit',
'user_agent' => 'agent');
/**
@@ -50,29 +50,29 @@ class CI_Loader {
*/
public function __construct()
{
- $this->_ci_ob_level = ob_get_level();
+ $this->_ci_ob_level = ob_get_level();
$this->_ci_library_paths = array(APPPATH, BASEPATH);
$this->_ci_helper_paths = array(APPPATH, BASEPATH);
$this->_ci_model_paths = array(APPPATH);
$this->_ci_view_paths = array(APPPATH.'views/' => TRUE);
-
+
log_message('debug', "Loader Class Initialized");
}
// --------------------------------------------------------------------
-
+
/**
* Set _base_classes variable
*
* This method is called once in CI_Controller.
*
- * @param array
+ * @param array
* @return object
*/
public function set_base_classes()
{
$this->_base_classes =& is_loaded();
-
+
return $this;
}
@@ -96,7 +96,7 @@ public function is_loaded($class)
{
return $this->_ci_classes[$class];
}
-
+
return FALSE;
}
@@ -260,7 +260,7 @@ public function database($params = '', $return = FALSE, $active_record = NULL)
return DB($params, $active_record);
}
- // Initialize the db variable. Needed to prevent
+ // Initialize the db variable. Needed to prevent
// reference errors with some configurations
$CI->db = '';
@@ -323,11 +323,11 @@ public function dbforge()
/**
* Load View
*
- * This function is used to load a "view" file. It has three parameters:
+ * This function is used to load a "view" file. It has three parameters:
*
* 1. The name of the "view" file to be included.
* 2. An associative array of data to be extracted for use in the view.
- * 3. TRUE/FALSE - whether to return the data or load it. In
+ * 3. TRUE/FALSE - whether to return the data or load it. In
* some cases it's advantageous to be able to return data so that
* a developer can process it in some way.
*
@@ -538,13 +538,13 @@ public function driver($library = '', $params = NULL, $object_name = NULL)
* Prepends a parent path to the library, model, helper, and config path arrays
*
* @param string
- * @param boolean
+ * @param boolean
* @return void
*/
public function add_package_path($path, $view_cascade=TRUE)
{
$path = rtrim($path, '/').'/';
-
+
array_unshift($this->_ci_library_paths, $path);
array_unshift($this->_ci_model_paths, $path);
array_unshift($this->_ci_helper_paths, $path);
@@ -604,7 +604,7 @@ public function remove_package_path($path = '', $remove_config_path = TRUE)
unset($this->{$var}[$key]);
}
}
-
+
if (isset($this->_ci_view_paths[$path.'views/']))
{
unset($this->_ci_view_paths[$path.'views/']);
@@ -643,7 +643,7 @@ protected function _ci_load($_ci_data)
{
$$_ci_val = ( ! isset($_ci_data[$_ci_val])) ? FALSE : $_ci_data[$_ci_val];
}
-
+
$file_exists = FALSE;
// Set the path to the requested file
@@ -665,11 +665,11 @@ protected function _ci_load($_ci_data)
$file_exists = TRUE;
break;
}
-
+
if ( ! $cascade)
{
break;
- }
+ }
}
}
@@ -710,9 +710,9 @@ protected function _ci_load($_ci_data)
* We buffer the output for two reasons:
* 1. Speed. You get a significant speed boost.
* 2. So that the final rendered template can be
- * post-processed by the output class. Why do we
- * need post processing? For one thing, in order to
- * show the elapsed page load time. Unless we
+ * post-processed by the output class. Why do we
+ * need post processing? For one thing, in order to
+ * show the elapsed page load time. Unless we
* can intercept the content right before it's sent to
* the browser and then stop the timer it won't be accurate.
*/
@@ -809,11 +809,11 @@ protected function _ci_load_class($class, $params = NULL, $object_name = NULL)
show_error("Unable to load the requested class: ".$class);
}
- // Safety: Was the class already loaded by a previous call?
+ // Safety: Was the class already loaded by a previous call?
if (in_array($subclass, $this->_ci_loaded_files))
{
// Before we deem this to be a duplicate request, let's see
- // if a custom object name is being supplied. If so, we'll
+ // if a custom object name is being supplied. If so, we'll
// return a new instance of the object
if ( ! is_null($object_name))
{
@@ -842,17 +842,17 @@ protected function _ci_load_class($class, $params = NULL, $object_name = NULL)
{
$filepath = $path.'libraries/'.$subdir.$class.'.php';
- // Does the file exist? No? Bummer...
+ // Does the file exist? No? Bummer...
if ( ! file_exists($filepath))
{
continue;
}
- // Safety: Was the class already loaded by a previous call?
+ // Safety: Was the class already loaded by a previous call?
if (in_array($filepath, $this->_ci_loaded_files))
{
// Before we deem this to be a duplicate request, let's see
- // if a custom object name is being supplied. If so, we'll
+ // if a custom object name is being supplied. If so, we'll
// return a new instance of the object
if ( ! is_null($object_name))
{
@@ -875,7 +875,7 @@ protected function _ci_load_class($class, $params = NULL, $object_name = NULL)
} // END FOREACH
- // One last attempt. Maybe the library is in a subdirectory, but it wasn't specified?
+ // One last attempt. Maybe the library is in a subdirectory, but it wasn't specified?
if ($subdir == '')
{
$path = strtolower($class).'/'.$class;
@@ -903,7 +903,7 @@ protected function _ci_load_class($class, $params = NULL, $object_name = NULL)
*/
protected function _ci_init_class($class, $prefix = '', $config = FALSE, $object_name = NULL)
{
- // Is there an associated config file for this class? Note: these should always be lowercase
+ // Is there an associated config file for this class? Note: these should always be lowercase
if ($config === NULL)
{
// Fetch the config paths containing any package paths
@@ -970,7 +970,7 @@ protected function _ci_init_class($class, $prefix = '', $config = FALSE, $object
}
// Set the variable name we will assign the class to
- // Was a custom class name supplied? If so we'll use it
+ // Was a custom class name supplied? If so we'll use it
$class = strtolower($class);
if (is_null($object_name))
@@ -1005,7 +1005,7 @@ protected function _ci_init_class($class, $prefix = '', $config = FALSE, $object
* The config/autoload.php file contains an array that permits sub-systems,
* libraries, and helpers to be loaded automatically.
*
- * This function is public, as it's used in the CI_Controller class.
+ * This function is public, as it's used in the CI_Controller class.
* However, there is no reason you should ever needs to use it.
*
* @param array
@@ -1021,7 +1021,7 @@ public function ci_autoloader()
{
include_once(APPPATH.'config/autoload.php');
}
-
+
if ( ! isset($autoload))
{
View
2  system/core/Model.php
@@ -1,4 +1,4 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
/**
* CodeIgniter
*
View
20 system/core/Output.php
@@ -1,4 +1,4 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
/**
* CodeIgniter
*
@@ -44,7 +44,7 @@ function __construct()
// Get mime types for later
if (defined('ENVIRONMENT') AND file_exists(APPPATH.'config/'.ENVIRONMENT.'/mimes.php'))
{
- include APPPATH.'config/'.ENVIRONMENT.'/mimes.php';
+ include APPPATH.'config/'.ENVIRONMENT.'/mimes.php';
}
else
{
@@ -122,7 +122,7 @@ function append_output($output)
*
* Lets you set a server header which will be outputted with the final display.
*
- * Note: If a file is cached, headers will not be sent. We need to figure out
+ * Note: If a file is cached, headers will not be sent. We need to figure out
* how to permit header data to be saved with the cache data...
*
* @access public
@@ -261,7 +261,7 @@ function cache($time)
* $this->final_output
*
* This function sends the finalized output data to the browser along
- * with any server headers and profile data. It also stops the
+ * with any server headers and profile data. It also stops the
* benchmark timer so the page rendering speed and memory usage can be shown.
*
* @access public
@@ -269,7 +269,7 @@ function cache($time)
*/
function _display($output = '')
{
- // Note: We use globals because we can't use $CI =& get_instance()
+ // Note: We use globals because we can't use $CI =& get_instance()
// since this function is sometimes called by the caching mechanism,
// which happens before the CI super object is available.
global $BM, $CFG;
@@ -290,7 +290,7 @@ function _display($output = '')
// --------------------------------------------------------------------
- // Do we need to write a cache file? Only if the controller does not have its
+ // Do we need to write a cache file? Only if the controller does not have its
// own _output() method and we are not dealing with a cache file, which we
// can determine by the existence of the $CI object above
if ($this->cache_expiration > 0 && isset($CI) && ! method_exists($CI, '_output'))
@@ -368,7 +368,7 @@ function _display($output = '')
// we will remove them and add them back after we insert the profile data
if (preg_match("|</body>.*?</html>|is", $output))
{
- $output = preg_replace("|</body>.*?</html>|is", '', $output);
+ $output = preg_replace("|</body>.*?</html>|is", '', $output);
$output .= $CI->profiler->run();
$output .= '</body></html>';
}
@@ -381,14 +381,14 @@ function _display($output = '')
// --------------------------------------------------------------------
// Does the controller contain a function named _output()?
- // If so send the output there. Otherwise, echo it.
+ // If so send the output there. Otherwise, echo it.
if (method_exists($CI, '_output'))
{
$CI->_output($output);
}
else
{
- echo $output; // Send it to the browser!
+ echo $output; // Send it to the browser!
}
log_message('debug', "Final output sent to browser");
@@ -458,7 +458,7 @@ function _display_cache(&$CFG, &$URI)
{
$cache_path = ($CFG->item('cache_path') == '') ? APPPATH.'cache/' : $CFG->item('cache_path');
- // Build the file path. The file name is an MD5 hash of the full URI
+ // Build the file path. The file name is an MD5 hash of the full URI
$uri = $CFG->item('base_url').
$CFG->item('index_page').
$URI->uri_string;
View
26 system/core/Router.php
@@ -1,4 +1,4 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
/**
* CodeIgniter
*
@@ -61,7 +61,7 @@ function __construct()
*/
function _set_routing()
{
- // Are query strings enabled in the config file? Normally CI doesn't utilize query strings
+ // Are query strings enabled in the config file? Normally CI doesn't utilize query strings
// since URI segments are more search-engine friendly, but they can optionally be used.
// If this feature is enabled, we will gather the directory/class/method a little differently
$segments = array();
@@ -95,7 +95,7 @@ function _set_routing()
{
include(APPPATH.'config/routes.php');
}
-
+
$this->routes = ( ! isset($route) OR ! is_array($route)) ? array() : $route;
unset($route);
@@ -103,7 +103,7 @@ function _set_routing()
// the URI doesn't correlated to a valid controller.
$this->default_controller = ( ! isset($this->routes['default_controller']) OR $this->routes['default_controller'] == '') ? FALSE : strtolower($this->routes['default_controller']);
- // Were there any query string segments? If so, we'll validate them and bail out since we're done.
+ // Were there any query string segments? If so, we'll validate them and bail out since we're done.
if (count($segments) > 0)
{
return $this->_validate_request($segments);
@@ -212,7 +212,7 @@ function _set_request($segments = array())
// --------------------------------------------------------------------
/**
- * Validates the supplied segments. Attempts to determine the path to
+ * Validates the supplied segments. Attempts to determine the path to
* the controller.
*
* @access private
@@ -277,7 +277,7 @@ function _validate_request($segments)
// If we've gotten this far it means that the URI does not correlate to a valid