From e334c472fb4be44feec3a73402fc4a2b062cbfc0 Mon Sep 17 00:00:00 2001 From: admin Date: Sat, 21 Oct 2006 19:44:22 +0000 Subject: --- index.php | 8 +- license.txt | 28 +- system/application/config/config.php | 44 +- system/application/config/database.php | 6 +- system/application/config/routes.php | 10 +- system/application/config/user_agents.php | 2 +- system/application/errors/error_404.php | 6 +- system/application/errors/error_db.php | 6 +- system/application/errors/error_general.php | 6 +- system/application/views/welcome_message.php | 6 +- system/codeigniter/Base4.php | 20 +- system/codeigniter/Base5.php | 34 +- system/codeigniter/CodeIgniter.php | 34 +- system/codeigniter/Common.php | 26 +- system/database/DB.php | 6 +- system/database/DB_active_rec.php | 34 +- system/database/DB_cache.php | 2 +- system/database/DB_driver.php | 176 ++-- system/database/DB_result.php | 52 +- system/database/DB_utility.php | 14 +- system/database/drivers/mssql/mssql_driver.php | 26 +- system/database/drivers/mssql/mssql_result.php | 10 +- system/database/drivers/mssql/mssql_utility.php | 6 +- system/database/drivers/mysql/mysql_driver.php | 44 +- system/database/drivers/mysql/mysql_result.php | 8 +- system/database/drivers/mysql/mysql_utility.php | 52 +- system/database/drivers/mysqli/mysqli_driver.php | 34 +- system/database/drivers/mysqli/mysqli_result.php | 10 +- system/database/drivers/mysqli/mysqli_utility.php | 54 +- system/database/drivers/oci8/oci8_driver.php | 902 ++++++++++----------- system/database/drivers/oci8/oci8_result.php | 308 +++---- system/database/drivers/oci8/oci8_utility.php | 4 +- system/database/drivers/odbc/odbc_driver.php | 28 +- system/database/drivers/odbc/odbc_result.php | 8 +- system/database/drivers/odbc/odbc_utility.php | 8 +- system/database/drivers/postgre/postgre_driver.php | 28 +- system/database/drivers/postgre/postgre_result.php | 8 +- .../database/drivers/postgre/postgre_utility.php | 6 +- system/database/drivers/sqlite/sqlite_driver.php | 38 +- system/database/drivers/sqlite/sqlite_result.php | 6 +- system/database/drivers/sqlite/sqlite_utility.php | 6 +- system/fonts/texb.ttf | Bin 143830 -> 143821 bytes system/helpers/array_helper.php | 4 +- system/helpers/cookie_helper.php | 10 +- system/helpers/date_helper.php | 32 +- system/helpers/directory_helper.php | 20 +- system/helpers/download_helper.php | 8 +- system/helpers/file_helper.php | 14 +- system/helpers/form_helper.php | 10 +- system/helpers/html_helper.php | 4 +- system/helpers/inflector_helper.php | 4 +- system/helpers/security_helper.php | 8 +- system/helpers/string_helper.php | 20 +- system/helpers/text_helper.php | 68 +- system/helpers/typography_helper.php | 32 +- system/helpers/url_helper.php | 38 +- system/helpers/xml_helper.php | 6 +- system/libraries/Benchmark.php | 62 +- system/libraries/Calendar.php | 132 +-- system/libraries/Config.php | 32 +- system/libraries/Controller.php | 30 +- system/libraries/Email.php | 127 ++- system/libraries/Encrypt.php | 32 +- system/libraries/Exceptions.php | 14 +- system/libraries/Hooks.php | 12 +- system/libraries/Image_lib.php | 136 ++-- system/libraries/Input.php | 38 +- system/libraries/Language.php | 10 +- system/libraries/Loader.php | 34 +- system/libraries/Log.php | 8 +- system/libraries/Model.php | 6 +- system/libraries/Output.php | 48 +- system/libraries/Pagination.php | 122 +-- system/libraries/Parser.php | 6 +- system/libraries/Profiler.php | 4 +- system/libraries/Router.php | 24 +- system/libraries/Session.php | 102 +-- system/libraries/Sha1.php | 292 +++---- system/libraries/Table.php | 6 +- system/libraries/Trackback.php | 54 +- system/libraries/URI.php | 18 +- system/libraries/Unit_test.php | 16 +- system/libraries/Upload.php | 418 +++++----- system/libraries/User_agent.php | 20 +- system/libraries/Validation.php | 52 +- system/libraries/Xmlrpc.php | 152 ++-- system/libraries/Xmlrpcs.php | 50 +- system/libraries/Zip.php | 46 +- system/plugins/captcha_pi.php | 54 +- system/plugins/js_calendar_pi.php | 26 +- system/scaffolding/Scaffolding.php | 8 +- system/scaffolding/views/stylesheet.css | 2 +- user_guide/changelog.html | 6 +- user_guide/database/active_record.html | 14 +- user_guide/database/caching.html | 24 +- user_guide/database/call_function.html | 8 +- user_guide/database/configuration.html | 28 +- user_guide/database/connecting.html | 12 +- user_guide/database/examples.html | 4 +- user_guide/database/fields.html | 6 +- user_guide/database/helpers.html | 2 +- user_guide/database/index.html | 2 +- user_guide/database/queries.html | 10 +- user_guide/database/results.html | 6 +- user_guide/database/table_data.html | 2 +- user_guide/database/transactions.html | 8 +- user_guide/database/utilities.html | 10 +- user_guide/general/alternative_php.html | 10 +- user_guide/general/ancillary_classes.html | 6 +- user_guide/general/autoloader.html | 2 +- user_guide/general/caching.html | 6 +- user_guide/general/changelog.html | 4 +- user_guide/general/controllers.html | 22 +- user_guide/general/core_classes.html | 6 +- user_guide/general/creating_libraries.html | 20 +- user_guide/general/credits.html | 4 +- user_guide/general/errors.html | 14 +- user_guide/general/helpers.html | 6 +- user_guide/general/hooks.html | 22 +- user_guide/general/index.html | 10 +- user_guide/general/libraries.html | 4 +- user_guide/general/models.html | 12 +- user_guide/general/multiple_apps.html | 2 +- user_guide/general/plugins.html | 8 +- user_guide/general/profiling.html | 2 +- user_guide/general/quick_reference.html | 2 +- user_guide/general/requirements.html | 2 +- user_guide/general/routing.html | 14 +- user_guide/general/scaffolding.html | 10 +- user_guide/general/security.html | 12 +- user_guide/general/urls.html | 10 +- user_guide/general/views.html | 8 +- user_guide/helpers/array_helper.html | 4 +- user_guide/helpers/cookie_helper.html | 6 +- user_guide/helpers/date_helper.html | 12 +- user_guide/helpers/directory_helper.html | 4 +- user_guide/helpers/download_helper.html | 4 +- user_guide/helpers/file_helper.html | 2 +- user_guide/helpers/form_helper.html | 14 +- user_guide/helpers/html_helper.html | 2 +- user_guide/helpers/index.html | 6 +- user_guide/helpers/inflector_helper.html | 2 +- user_guide/helpers/security_helper.html | 4 +- user_guide/helpers/string_helper.html | 4 +- user_guide/helpers/text_helper.html | 2 +- user_guide/helpers/typography_helper.html | 8 +- user_guide/helpers/url_helper.html | 10 +- user_guide/helpers/xml_helper.html | 2 +- user_guide/images/appflowchart.gif | Bin 25276 -> 25273 bytes user_guide/images/ci_logo.jpg | Bin 5602 -> 5601 bytes user_guide/images/ci_quick_ref.png | Bin 94476 -> 94906 bytes user_guide/index.html | 12 +- user_guide/installation/downloads.html | 2 +- user_guide/installation/index.html | 4 +- user_guide/installation/troubleshooting.html | 6 +- user_guide/installation/upgrade_120.html | 2 +- user_guide/installation/upgrade_130.html | 10 +- user_guide/installation/upgrade_131.html | 4 +- user_guide/installation/upgrade_132.html | 4 +- user_guide/installation/upgrade_133.html | 6 +- user_guide/installation/upgrade_140.html | 6 +- user_guide/installation/upgrade_141.html | 8 +- user_guide/installation/upgrade_150.html | 10 +- user_guide/installation/upgrade_b11.html | 4 +- user_guide/installation/upgrading.html | 2 +- user_guide/libraries/benchmark.html | 12 +- user_guide/libraries/calendar.html | 8 +- user_guide/libraries/config.html | 6 +- user_guide/libraries/email.html | 4 +- user_guide/libraries/encryption.html | 16 +- user_guide/libraries/file_uploading.html | 16 +- user_guide/libraries/image_lib.html | 18 +- user_guide/libraries/input.html | 6 +- user_guide/libraries/language.html | 6 +- user_guide/libraries/loader.html | 22 +- user_guide/libraries/output.html | 6 +- user_guide/libraries/pagination.html | 6 +- user_guide/libraries/parser.html | 8 +- user_guide/libraries/sessions.html | 22 +- user_guide/libraries/table.html | 10 +- user_guide/libraries/trackback.html | 6 +- user_guide/libraries/unit_testing.html | 12 +- user_guide/libraries/uri.html | 6 +- user_guide/libraries/user_agent.html | 4 +- user_guide/libraries/validation.html | 26 +- user_guide/libraries/xmlrpc.html | 42 +- user_guide/libraries/zip.html | 6 +- user_guide/license.html | 4 +- user_guide/nav/moo.fx.pack.js | 6 +- user_guide/nav/prototype.lite.js | 112 +-- user_guide/overview/appflow.html | 2 +- user_guide/overview/at_a_glance.html | 24 +- user_guide/overview/features.html | 4 +- user_guide/overview/goals.html | 4 +- user_guide/overview/index.html | 2 +- user_guide/overview/mvc.html | 10 +- user_guide/toc.html | 186 ++--- user_guide/userguide.css | 10 +- 198 files changed, 2871 insertions(+), 2872 deletions(-) diff --git a/index.php b/index.php index 8d7a30252..0386ed6ed 100644 --- a/index.php +++ b/index.php @@ -17,7 +17,7 @@ error_reporting(E_ALL); |--------------------------------------------------------------- | | 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. | | NO TRAILING SLASH! @@ -31,7 +31,7 @@ error_reporting(E_ALL); | APPLICATION FOLDER NAME |--------------------------------------------------------------- | -| If you want this front controller to use a different "application" +| If you want this front controller to use a different "application" | folder then the default one you can set its name here. | | NO TRAILING SLASH! @@ -59,7 +59,7 @@ if ($application_folder == '') $application_folder = 'application'; } -// Some versions of PHP don't support the E_STRICT constant so we'll +// Some versions of PHP don't support the E_STRICT constant so we'll // explicitly define it so that it will be available to the Exception class if ( ! defined('E_STRICT')) { @@ -69,7 +69,7 @@ if ( ! defined('E_STRICT')) // Define a few constants that we use througout the framework. // EXT - contains the file extension. Typically ".php" // FCPATH - contains the full server path to THIS file. -// SELF - contains the name of THIS file. +// SELF - contains the name of THIS file. // BASEPATH - contains the full server path to the "system" folder // APPPATH - contains the full server path to the "application" folder diff --git a/license.txt b/license.txt index cd779972c..4476208aa 100644 --- a/license.txt +++ b/license.txt @@ -18,7 +18,7 @@ the following conditions are met: 3. Redistributions in binary form must reproduce the above copyright notice in the documentation and/or other materials provided with the distribution. -4. Any files that have been modified must carry notices stating the nature +4. Any files that have been modified must carry notices stating the nature of the change and the names of those who changed them. 5. Products derived from the Software must include an acknowledgment that @@ -26,27 +26,27 @@ the following conditions are met: materials provided with the distribution. 6. Products derived from the Software may not be called "Code Igniter", - nor may "Code Igniter" appear in their name, without prior written + nor may "Code Igniter" appear in their name, without prior written permission from pMachine, Inc. INDEMNITY -You agree to indemnify and hold harmless the authors of the Software and -any contributors for any direct, indirect, incidental, or consequential -third-party claims, actions or suits, as well as any related expenses, -liabilities, damages, settlements or fees arising from your use or misuse +You agree to indemnify and hold harmless the authors of the Software and +any contributors for any direct, indirect, incidental, or consequential +third-party claims, actions or suits, as well as any related expenses, +liabilities, damages, settlements or fees arising from your use or misuse of the Software, or a violation of any terms of this license. DISCLAIMER OF WARRANTY -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESSED OR -IMPLIED, INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF QUALITY, PERFORMANCE, -NON-INFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESSED OR +IMPLIED, INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF QUALITY, PERFORMANCE, +NON-INFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. LIMITATIONS OF LIABILITY -YOU ASSUME ALL RISK ASSOCIATED WITH THE INSTALLATION AND USE OF THE SOFTWARE. -IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS OF THE SOFTWARE BE LIABLE -FOR CLAIMS, DAMAGES OR OTHER LIABILITY ARISING FROM, OUT OF, OR IN CONNECTION -WITH THE SOFTWARE. LICENSE HOLDERS ARE SOLELY RESPONSIBLE FOR DETERMINING THE +YOU ASSUME ALL RISK ASSOCIATED WITH THE INSTALLATION AND USE OF THE SOFTWARE. +IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS OF THE SOFTWARE BE LIABLE +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 +BUT NOT LIMITED TO THE RISKS OF PROGRAM ERRORS, DAMAGE TO EQUIPMENT, LOSS OF DATA OR SOFTWARE PROGRAMS, OR UNAVAILABILITY OR INTERRUPTION OF OPERATIONS. diff --git a/system/application/config/config.php b/system/application/config/config.php index ab4f445f2..0ed58d940 100644 --- a/system/application/config/config.php +++ b/system/application/config/config.php @@ -5,7 +5,7 @@ | Base Site URL |-------------------------------------------------------------------------- | -| URL to your Code Igniter root. Typically this will be your base URL, +| URL to your Code Igniter root. Typically this will be your base URL, | WITH a trailing slash: | | http://www.your-site.com/ @@ -18,8 +18,8 @@ $config['base_url'] = "http://127.0.0.1/CodeIgniter/"; | Index File |-------------------------------------------------------------------------- | -| Typically this will be your index.php file, unless you've renamed it to -| something else. If you are using mod_rewrite to remove the page set this +| Typically this will be your index.php file, unless you've renamed it to +| something else. If you are using mod_rewrite to remove the page set this | variable so that it is blank. | */ @@ -30,15 +30,15 @@ $config['index_page'] = "index.php"; | URI PROTOCOL |-------------------------------------------------------------------------- | -| This item determines which server global should be used to retrieve the +| This item determines which server global should be used to retrieve the | 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 -| 'PATH_INFO' Uses the PATH_INFO +| 'PATH_INFO' Uses the PATH_INFO | 'QUERY_STRING' Uses the QUERY_STRING | 'REQUEST_URI' Uses the REQUEST_URI -| 'ORIG_PATH_INFO' Uses the ORIG_PATH_INFO +| 'ORIG_PATH_INFO' Uses the ORIG_PATH_INFO | */ $config['uri_protocol'] = "AUTO"; @@ -50,7 +50,7 @@ $config['uri_protocol'] = "AUTO"; | | This option allows you to add a suffix to all URLs generated by Code Igniter. | For more information please see the user guide: -| +| | http://www.codeigniter.com/user_guide/general/urls.html */ @@ -61,7 +61,7 @@ $config['url_suffix'] = ""; | Default Language |-------------------------------------------------------------------------- | -| This determines which set of language files should be used. Make sure +| This determines which set of language files should be used. Make sure | there is an available translation if you intend to use something other | than english. | @@ -88,7 +88,7 @@ $config['enable_hooks'] = TRUE; | | This item allows you to set the filename/classname prefix when extending | native libraries. For more information please see the user guide: -| +| | http://www.codeigniter.com/user_guide/general/core_classes.html | http://www.codeigniter.com/user_guide/general/creating_libraries.html | @@ -109,7 +109,7 @@ $config['subclass_prefix'] = 'MY_'; | 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. -| +| | DO NOT CHANGE THIS UNLESS YOU FULLY UNDERSTAND THE REPERCUSSIONS!! | */ @@ -147,7 +147,7 @@ $config['function_trigger'] = 'm'; | Error Logging |-------------------------------------------------------------------------- | -| You can enable error logging by setting a threshold over zero. The +| You can enable error logging by setting a threshold over zero. The | threshold determines what gets logged. Threshold options are: | | 0 = Error logging TURNED OFF @@ -156,7 +156,7 @@ $config['function_trigger'] = 'm'; | 3 = Informational Messages | 4 = All Messages | -| For a live site you'll usually only enable Errors (1) to be logged otherwise +| For a live site you'll usually only enable Errors (1) to be logged otherwise | your log files will fill up very fast. | */ @@ -200,7 +200,7 @@ $config['cache_path'] = ''; | Encryption Key |-------------------------------------------------------------------------- | -| If you use the Encryption class or the Sessions class with encryption +| If you use the Encryption class or the Sessions class with encryption | enabled you MUST set an encryption key. See the user guide for info. | */ @@ -229,14 +229,14 @@ $config['sess_match_useragent'] = TRUE; |-------------------------------------------------------------------------- | Cookie Related Variables |-------------------------------------------------------------------------- -| +| | '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 | */ $config['cookie_prefix'] = ""; -$config['cookie_domain'] = ""; +$config['cookie_domain'] = ""; $config['cookie_path'] = "/"; /* @@ -244,7 +244,7 @@ $config['cookie_path'] = "/"; | Global XSS Filtering |-------------------------------------------------------------------------- | -| Determines whether the XSS filter is always active when GET, POST or +| Determines whether the XSS filter is always active when GET, POST or | COOKIE data is encountered | */ @@ -256,13 +256,13 @@ $config['global_xss_filtering'] = FALSE; |-------------------------------------------------------------------------- | | Enables Gzip output compression for faster page loads. When enabled, -| the output class will test whether your server supports Gzip. +| 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 | 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. | @@ -274,9 +274,9 @@ $config['compress_output'] = FALSE; | Master Time Reference |-------------------------------------------------------------------------- | -| 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 +| 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 | regarding date handling. | */ diff --git a/system/application/config/database.php b/system/application/config/database.php index 9d8c77831..b3246b6ec 100644 --- a/system/application/config/database.php +++ b/system/application/config/database.php @@ -13,12 +13,12 @@ | ------------------------------------------------------------------- | | ['hostname'] The hostname of your database server. -| ['username'] The username used to connect to the database -| ['password'] The password used to connect to the database +| ['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 -| ['dbprefix'] You can add an optional prefix, which will be added +| ['dbprefix'] You can add an optional prefix, which will be added | 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. diff --git a/system/application/config/routes.php b/system/application/config/routes.php index 8fa167803..1702e4f4b 100644 --- a/system/application/config/routes.php +++ b/system/application/config/routes.php @@ -3,9 +3,9 @@ | ------------------------------------------------------------------------- | URI ROUTING | ------------------------------------------------------------------------- -| This file lets you re-map URI requests to specific controller functions. +| This file lets you re-map URI requests to specific controller functions. | -| Typically there is a one-to-one relationship between a URL string +| Typically there is a one-to-one relationship between a URL string | and its corresponding controller class/method. The segments in a | URL normally follow this pattern: | @@ -13,7 +13,7 @@ | | In some instances, however, you may want to remap this relationship | so that a different class/function is called than the one -| corresponding to the URL. +| corresponding to the URL. | | Please see the user guide for complete details: | @@ -33,8 +33,8 @@ | | $route['scaffolding_trigger'] = 'scaffolding'; | -| This route lets you se t a "secret" word that will trigger the -| scaffolding feature for added security. Note: Scaffolding must be +| This route lets you se t a "secret" word that will trigger the +| scaffolding feature for added security. Note: Scaffolding must be | enabled in the controller in which you intend to use it. | */ diff --git a/system/application/config/user_agents.php b/system/application/config/user_agents.php index a799f06bd..6fa7b4a7e 100644 --- a/system/application/config/user_agents.php +++ b/system/application/config/user_agents.php @@ -4,7 +4,7 @@ | USER AGENT TYPES | ------------------------------------------------------------------- | This file contains four arrays of user agent data. It is used by the -| User Agent Class to help identify browser, platform, robot, and +| User Agent Class to help identify browser, platform, robot, and | 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. | diff --git a/system/application/errors/error_404.php b/system/application/errors/error_404.php index e5fa8f9db..bfe9444b2 100644 --- a/system/application/errors/error_404.php +++ b/system/application/errors/error_404.php @@ -4,9 +4,9 @@ 404 Page Not Found